From 94bb5644907c16b742d05a6f51cc82785b945f4a Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 23 Oct 2018 11:36:58 +0200 Subject: Remove some outdated Qt version checks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We can't not build with older than Qt 5.9 anyway due to QSG and qmake changes. Change-Id: Iff0247e70d9ffc1e045e2c571f0089d68df9a589 Reviewed-by: Michael Brüning --- src/core/web_engine_context.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/core/web_engine_context.cpp') diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index b7cf1344b..fefccae0e 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -142,10 +142,8 @@ bool usingQtQuick2DRenderer() } } -#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)) if (device.isEmpty()) device = QQuickWindow::sceneGraphBackend(); -#endif if (device.isEmpty()) device = QString::fromLocal8Bit(qgetenv("QT_QUICK_BACKEND")); if (device.isEmpty()) -- cgit v1.2.3 From 6e3aaa4b22892fd1fecdb9cf6c6e96296c13844a Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 23 Oct 2018 14:43:39 +0200 Subject: Allow --enable-webgl-software-rendering outside Windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit While less useful, it still makes sense occasionally on other platform, if software OpenGL is used. At least for testing. Change-Id: I1371674aec58b4e9e4f848ab353d04a896137973 Reviewed-by: Jüri Valdmann --- src/core/web_engine_context.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/core/web_engine_context.cpp') diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index fefccae0e..62ed3c2fd 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -354,10 +354,8 @@ WebEngineContext::WebEngineContext() appArgs.append(QString::fromLocal8Bit(qgetenv(kChromiumFlagsEnv)).split(' ')); } -#ifdef Q_OS_WIN bool enableWebGLSoftwareRendering = appArgs.removeAll(QStringLiteral("--enable-webgl-software-rendering")); -#endif bool useEmbeddedSwitches = false; #if defined(QTWEBENGINE_EMBEDDED_SWITCHES) @@ -452,12 +450,10 @@ WebEngineContext::WebEngineContext() bool tryGL = !usingANGLE() && (!usingSoftwareDynamicGL() -#ifdef Q_OS_WIN - // If user requested WebGL support on Windows, instead of using Skia rendering to - // bitmaps, use software rendering via opengl32sw.dll. This might be less + // If user requested WebGL support instead of using Skia rendering to + // bitmaps, use software rendering via software OpenGL. This might be less // performant, but at least provides WebGL support. || enableWebGLSoftwareRendering -#endif ) && !usingQtQuick2DRenderer(); @@ -524,12 +520,10 @@ WebEngineContext::WebEngineContext() if (glType) { parsedCommandLine->AppendSwitchASCII(switches::kUseGL, glType); parsedCommandLine->AppendSwitch(switches::kInProcessGPU); -#ifdef Q_OS_WIN if (enableWebGLSoftwareRendering) { parsedCommandLine->AppendSwitch(switches::kDisableGpuRasterization); parsedCommandLine->AppendSwitch(switches::kIgnoreGpuBlacklist); } -#endif } else { parsedCommandLine->AppendSwitch(switches::kDisableGpu); } -- cgit v1.2.3