diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-07-10 10:28:39 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-07-10 10:28:39 +0200 |
| commit | b3ff7eef14ed3fb48bef06abff31a272d0bc8915 (patch) | |
| tree | aa4cbda8bd6c2dd8fe0cc2f1c30c1fc787de9412 /src/core | |
| parent | 3c34f95ad4a96737f66ab4933edb9e00abecdc24 (diff) | |
| parent | 4746bb904bf6841137d5b50357bf79c852bf5d06 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I156385925a060081cce7091da199266482aec5d8
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/compositor/compositor_resource_tracker.cpp | 3 | ||||
| -rw-r--r-- | src/core/config/common.pri | 4 | ||||
| -rw-r--r-- | src/core/profile_adapter.cpp | 8 |
3 files changed, 11 insertions, 4 deletions
diff --git a/src/core/compositor/compositor_resource_tracker.cpp b/src/core/compositor/compositor_resource_tracker.cpp index 73242c693..741c2717c 100644 --- a/src/core/compositor/compositor_resource_tracker.cpp +++ b/src/core/compositor/compositor_resource_tracker.cpp @@ -174,7 +174,8 @@ quint32 CompositorResourceTracker::consumeMailbox(const gpu::MailboxHolder &mail DCHECK(mailboxManager); if (mailboxHolder.sync_token.HasData()) mailboxManager->PullTextureUpdates(mailboxHolder.sync_token); - return service_id(mailboxManager->ConsumeTexture(mailboxHolder.mailbox)); + gpu::TextureBase *tex = mailboxManager->ConsumeTexture(mailboxHolder.mailbox); + return tex ? service_id(tex) : 0; #else NOTREACHED(); #endif // QT_CONFIG(OPENGL) diff --git a/src/core/config/common.pri b/src/core/config/common.pri index 18bd358f3..eabbf4ec0 100644 --- a/src/core/config/common.pri +++ b/src/core/config/common.pri @@ -95,6 +95,10 @@ CONFIG(debug, debug|release) { gn_args += use_debug_fission=false # MSVC requires iterator debug to always match and Qt has leaves it default on. msvc: gn_args += enable_iterator_debugging=true + + # We also can not have optimized V8 binaries for MSVC as iterator debugging + # would mismatch. + msvc|v8base_debug: gn_args += v8_optimized_debug=false } !webcore_debug: gn_args += remove_webcore_debug_symbols=true diff --git a/src/core/profile_adapter.cpp b/src/core/profile_adapter.cpp index 65d5c2da2..c76ba34a9 100644 --- a/src/core/profile_adapter.cpp +++ b/src/core/profile_adapter.cpp @@ -448,7 +448,7 @@ void ProfileAdapter::setHttpCacheMaxSize(int maxSize) m_profile->m_profileIOData->updateHttpCache(); } -enum class SchemeType { Protected, Overridable, Custom }; +enum class SchemeType { Protected, Overridable, Custom, Unknown }; static SchemeType schemeType(const QByteArray &canonicalScheme) { static const QSet<QByteArray> blacklist{ @@ -473,7 +473,9 @@ static SchemeType schemeType(const QByteArray &canonicalScheme) return SchemeType::Overridable; if (blacklisted || (standardSyntax && !customScheme)) return SchemeType::Protected; - return SchemeType::Custom; + if (customScheme) + return SchemeType::Custom; + return SchemeType::Unknown; } QWebEngineUrlSchemeHandler *ProfileAdapter::urlSchemeHandler(const QByteArray &scheme) @@ -540,7 +542,7 @@ void ProfileAdapter::installUrlSchemeHandler(const QByteArray &scheme, QWebEngin return; } - if (type == SchemeType::Custom) + if (type == SchemeType::Unknown) qWarning("Please register the custom scheme '%s' via QWebEngineUrlScheme::registerScheme() " "before installing the custom scheme handler.", scheme.constData()); |