diff options
author | Liang Qi <liang.qi@qt.io> | 2018-02-12 19:39:58 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-02-12 19:39:58 +0100 |
commit | 60f2cfe39ab2822bcc3b86453d8b05cc76d56961 (patch) | |
tree | 6a5ad24326b48cc965eab4c4af1fcf4b3e2c6097 /src | |
parent | 271e3cd4f23539382a5f9ea4f5a29f500584da5b (diff) | |
parent | 9dc8dff7a8f4d58f71d816375d49f8829f06aae5 (diff) |
Merge remote-tracking branch 'origin/5.10.1' into 5.11
Change-Id: If971fbfcb158c921e2328dfcdef3bd3322f30c4b
Diffstat (limited to 'src')
-rw-r--r-- | src/core/browser_context_adapter.cpp | 2 | ||||
-rw-r--r-- | src/core/config/linux.pri | 4 | ||||
-rw-r--r-- | src/core/web_engine_context.cpp | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/core/browser_context_adapter.cpp b/src/core/browser_context_adapter.cpp index 654482b02..a86c66cc5 100644 --- a/src/core/browser_context_adapter.cpp +++ b/src/core/browser_context_adapter.cpp @@ -104,11 +104,11 @@ BrowserContextAdapter::BrowserContextAdapter(const QString &storageName) BrowserContextAdapter::~BrowserContextAdapter() { Q_ASSERT(!m_downloadManagerDelegate); + m_browserContext->ShutdownStoragePartitions(); } void BrowserContextAdapter::shutdown() { - m_browserContext->ShutdownStoragePartitions(); if (m_downloadManagerDelegate) { m_browserContext->GetDownloadManager(m_browserContext.data())->Shutdown(); m_downloadManagerDelegate.reset(); diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index f4a95a03c..f3103e749 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -112,12 +112,12 @@ host_build { PKG_CONFIG_HOST = $$(GN_PKG_CONFIG_HOST) pkgConfigLibDir = $$(PKG_CONFIG_LIBDIR) pkgConfigSysrootDir = $$(PKG_CONFIG_SYSROOT_DIR) - isEmpty(PKG_CONFIG_HOST): PKG_CONFIG_HOST = $$QMAKE_PKG_CONFIG_HOST - cross_compile { + isEmpty(PKG_CONFIG_HOST): cross_compile { !isEmpty(pkgConfigLibDir)|!isEmpty(pkgConfigSysrootDir) { PKG_CONFIG_HOST = $$pkgConfigHostExecutable() } } + isEmpty(PKG_CONFIG_HOST): PKG_CONFIG_HOST = $$QMAKE_PKG_CONFIG_HOST gn_args += host_pkg_config=\"$$PKG_CONFIG_HOST\" } diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index a10aef115..bdb61d0d3 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -350,6 +350,9 @@ WebEngineContext::WebEngineContext() // The Mojo local-storage is currently pretty broken and saves in $$PWD/Local\ Storage parsedCommandLine->AppendSwitch(switches::kDisableMojoLocalStorage); + // Shared workers are not safe until Chromium 64 + parsedCommandLine->AppendSwitch(switches::kDisableSharedWorkers); + #if defined(Q_OS_MACOS) // Accelerated decoding currently does not work on macOS due to issues with OpenGL Rectangle // texture support. See QTBUG-60002. |