Paste P352

Masterwork From Distant Lands
ActivePublic
Actions

Authored by dkazakov on Mar 20 2019, 4:18 PM.
diff --git a/libs/global/KisUsageLogger.cpp b/libs/global/KisUsageLogger.cpp
index fb950e3..f6b3ad0 100644
--- a/libs/global/KisUsageLogger.cpp
+++ b/libs/global/KisUsageLogger.cpp
@@ -116,7 +116,7 @@ void KisUsageLogger::writeHeader()
// Krita version info
systemInfo.append("Krita\n");
systemInfo.append("\n Version: ").append(KritaVersionWrapper::versionString(true));
- systemInfo.append("\n Languages: ").append(KLocalizedString::languages().join(", "));
+ //systemInfo.append("\n Languages: ").append(KLocalizedString::languages().join(", "));
systemInfo.append("\n Hidpi: ").append(QCoreApplication::testAttribute(Qt::AA_EnableHighDpiScaling) ? "true" : "false");
systemInfo.append("\n\n");
diff --git a/libs/ui/opengl/KisOpenGLModeProber.cpp b/libs/ui/opengl/KisOpenGLModeProber.cpp
index c23d9a6..06fdda4 100644
--- a/libs/ui/opengl/KisOpenGLModeProber.cpp
+++ b/libs/ui/opengl/KisOpenGLModeProber.cpp
@@ -135,8 +135,8 @@ KisOpenGLModeProber::probeFormat(const QSurfaceFormat &format, bool adjustGlobal
formatSetter.reset(new SurfaceFormatSetter(format));
int argc = 1;
- QByteArray data("krita");
- char *argv = data.data();
+ static char* data = "krita";
+ char *argv = data;
application.reset(new QApplication(argc, &argv));
}
@@ -239,6 +239,7 @@ bool KisOpenGLModeProber::isFormatHDR(const QSurfaceFormat &format)
return isBt2020PQ || isBt709G10;
#else
+ Q_UNUSED(format);
return false;
#endif
}
diff --git a/libs/ui/opengl/kis_opengl.cpp b/libs/ui/opengl/kis_opengl.cpp
index 4714c7e..ce0da9a 100644
--- a/libs/ui/opengl/kis_opengl.cpp
+++ b/libs/ui/opengl/kis_opengl.cpp
@@ -599,6 +599,9 @@ QSurfaceFormat KisOpenGL::selectSurfaceFormat(KisOpenGL::OpenGLRenderer preferre
QSurfaceFormat defaultFormat = generateSurfaceFormat(QSurfaceFormat::DefaultRenderableType,
KisConfig::BT709_G22, false);
+
+ return defaultFormat;
+
Info info = KisOpenGLModeProber::instance()->probeFormat(defaultFormat);
KIS_SAFE_ASSERT_RECOVER_RETURN_VALUE(info, QSurfaceFormat());
dkazakov edited the content of this paste. (Show Details)Mar 20 2019, 4:18 PM
dkazakov changed the title of this paste from untitled to Masterwork From Distant Lands.