Merge remote-tracking branch 'origin/5.13' into dev

Change-Id: I156385925a060081cce7091da199266482aec5d8

1 files changed, 5 insertions, 3 deletions

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());