diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-04-30 10:39:42 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-04-30 10:40:26 +0200 |
commit | 4181db05fc8f1c96d0bbf2e88a64e6d3bb11c6cf (patch) | |
tree | f4f9127216f92102f3420949f82e3186fee15e54 /src/core/api | |
parent | b546cea1b5ba6721bf7fcb687c6c069d4442ba34 (diff) | |
parent | 26ac59af2306b4f6f83e791bb3e828b9f7b1a721 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I051052a70a6e764202a90d77fc1a0f73688d3704
Diffstat (limited to 'src/core/api')
-rw-r--r-- | src/core/api/qwebengineurlscheme.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/core/api/qwebengineurlscheme.cpp b/src/core/api/qwebengineurlscheme.cpp index 9b04f46c5..9cc5b5056 100644 --- a/src/core/api/qwebengineurlscheme.cpp +++ b/src/core/api/qwebengineurlscheme.cpp @@ -378,6 +378,11 @@ void QWebEngineUrlScheme::registerScheme(const QWebEngineUrlScheme &scheme) return; } + if (url::IsStandard(scheme.d->name.data(), url::Component(0, scheme.d->name.size()))) { + qWarning() << "QWebEngineUrlScheme::registerScheme: Scheme" << scheme.name() << "is a standard scheme"; + return; + } + if (g_schemesLocked) { qWarning() << "QWebEngineUrlScheme::registerScheme: Too late to register scheme" << scheme.name(); return; |