diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-27 11:28:30 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-11-02 12:42:10 +0100 |
| commit | 13ac394567cb287c5caceef15f531544d73fde09 (patch) | |
| tree | 38a497e108b6de6c98e9621e75def96dd8b6a55e /src/core/web_engine_context.cpp | |
| parent | f51f50c22e770e1ab20ecccc8a32906e4014caed (diff) | |
Update dependencies on 'dev' in qt/qtwebengine
Change-Id: I74c7293ebf5ace5bd07e3bf5455dd90bf4ed6380
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/core/web_engine_context.cpp')
| -rw-r--r-- | src/core/web_engine_context.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index 32701f230..5c125bb8f 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -162,6 +162,9 @@ static bool usingANGLE() static bool usingDefaultSGBackend() { + if (QQuickWindow::graphicsApi() != QSGRendererInterface::OpenGL) + return false; + const QStringList args = QGuiApplication::arguments(); //folow logic from contextFactory in src/quick/scenegraph/qsgcontextplugin.cpp @@ -187,7 +190,7 @@ bool usingSoftwareDynamicGL() if (QCoreApplication::testAttribute(Qt::AA_UseSoftwareOpenGL)) return true; #if defined(Q_OS_WIN) - HMODULE handle = QPlatformInterface::QWGLContext::openGLModuleHandle(); + HMODULE handle = QNativeInterface::QWGLContext::openGLModuleHandle(); wchar_t path[MAX_PATH]; DWORD size = GetModuleFileName(handle, path, MAX_PATH); QFileInfo openGLModule(QString::fromWCharArray(path, size)); @@ -652,6 +655,9 @@ WebEngineContext::WebEngineContext() // Enable sandboxing on OS X and Linux (Desktop / Embedded) by default. bool disable_sandbox = qEnvironmentVariableIsSet(kDisableSandboxEnv); +#if defined(Q_OS_WIN) + disable_sandbox = true; // FIXME: Windows sandbox no longer works on CI, but works fine locally. +#endif if (!disable_sandbox) { #if defined(Q_OS_LINUX) parsedCommandLine->AppendSwitch(service_manager::switches::kDisableSetuidSandbox); |