diff options
| author | Michael Brüning <michael.bruning@qt.io> | 2018-02-05 10:42:18 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-02-05 10:04:22 +0000 |
| commit | 45189de8f0e8364cbcd600f3c4460018544beda6 (patch) | |
| tree | eb7521adb780dd942ecc0d7d7738dd176f525bb7 | |
| parent | 7e03f40a2b7f4793a3ad02f59b213d160124941e (diff) | |
| parent | e864d8656c2682fc79a5affe789992de318c8f8a (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10.1
Conflicts:
src/core/web_engine_context.cpp
Change-Id: I004994a0ab6dbc54370b6973de1816cd673154c6
| -rw-r--r-- | examples/webengine/quicknanobrowser/ApplicationRoot.qml | 2 | ||||
| -rw-r--r-- | src/core/browser_context_adapter.cpp | 2 | ||||
| -rw-r--r-- | src/core/web_engine_context.cpp | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/examples/webengine/quicknanobrowser/ApplicationRoot.qml b/examples/webengine/quicknanobrowser/ApplicationRoot.qml index 78defab80..014b556a1 100644 --- a/examples/webengine/quicknanobrowser/ApplicationRoot.qml +++ b/examples/webengine/quicknanobrowser/ApplicationRoot.qml @@ -55,7 +55,7 @@ QtObject { id: root property QtObject defaultProfile: WebEngineProfile { - storageName: "Default" + storageName: "Profile" } property QtObject otrProfile: WebEngineProfile { diff --git a/src/core/browser_context_adapter.cpp b/src/core/browser_context_adapter.cpp index 3f8397752..66fea200f 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/web_engine_context.cpp b/src/core/web_engine_context.cpp index 9199bd102..99d0e38df 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -348,6 +348,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. |