diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-11-05 17:09:46 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-11-05 17:09:46 +0100 |
| commit | 79f5361400fa91b30cc4a1b34335b49284ba3e07 (patch) | |
| tree | 3c5f79b230ff4c83b441cba5df7da357bc9c4f2e /src/core/web_engine_context.cpp | |
| parent | bc1529f56b8c86259c7f952b0ea9b439f5cc8d53 (diff) | |
| parent | 34b714122051eae86ac49fd95c7015fb081f79eb (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/core/render_widget_host_view_qt.cpp
src/core/web_contents_adapter_client.h
src/webenginewidgets/api/qwebenginepage_p.h
Change-Id: Ibd011c40839c09469218ac4c71a13d0a0b1c9778
Diffstat (limited to 'src/core/web_engine_context.cpp')
| -rw-r--r-- | src/core/web_engine_context.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index 7e91b3bdb..db74978d3 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -144,10 +144,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()) @@ -364,10 +362,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) @@ -462,12 +458,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(); @@ -534,12 +528,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); } |