diff options
| author | Jüri Valdmann <juri.valdmann@qt.io> | 2019-05-31 14:51:42 +0200 |
|---|---|---|
| committer | Jüri Valdmann <juri.valdmann@qt.io> | 2019-07-03 13:59:09 +0200 |
| commit | c6dc287b3af63f8c7e43f7a79de488c98db57302 (patch) | |
| tree | b661a54f9a98349617115f90d047cd13e1820c75 /src/core/profile_adapter.cpp | |
| parent | bd864f6418ed164c19a700fc4b6ebab3be431c62 (diff) | |
Fix unregistered custom scheme warning
The warning is emitted even for registered custom schemes.
Change-Id: I07a505253627a920d96b75df8fa1fb2d81ab1f68
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/profile_adapter.cpp')
| -rw-r--r-- | src/core/profile_adapter.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/core/profile_adapter.cpp b/src/core/profile_adapter.cpp index ff0199833..ebb533206 100644 --- a/src/core/profile_adapter.cpp +++ b/src/core/profile_adapter.cpp @@ -443,7 +443,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{ @@ -468,7 +468,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) @@ -535,7 +537,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()); |