diff options
| author | Michael Brüning <michael.bruning@qt.io> | 2018-12-14 13:15:31 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-12-18 15:58:19 +0100 |
| commit | 50fac0d1d7e82f2423e0a3e557b4a1f30be5bf33 (patch) | |
| tree | b085f03fdafa4ecbcfcb5a96b68404e155879b6a /src/core/profile_adapter.cpp | |
| parent | 8124f0bc1893e0997989913044665fa1c5cf79d7 (diff) | |
| parent | 4f1e0003d98116e33a847360e0e95c46daae25fc (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/core/compositor/delegated_frame_node.cpp
src/core/profile_adapter.cpp
src/core/profile_io_data_qt.cpp
src/webengine/api/qquickwebengineprofile.cpp
src/webenginewidgets/api/qwebengineprofile.cpp
Change-Id: I35ec8480e758bbcb6c5942a5401cb1b6dbdcc428
Diffstat (limited to 'src/core/profile_adapter.cpp')
| -rw-r--r-- | src/core/profile_adapter.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/core/profile_adapter.cpp b/src/core/profile_adapter.cpp index 437423a4a..b080a4ced 100644 --- a/src/core/profile_adapter.cpp +++ b/src/core/profile_adapter.cpp @@ -44,6 +44,7 @@ #include "content/public/browser/browsing_data_remover.h" #include "content/public/browser/download_manager.h" +#include "api/qwebengineurlscheme.h" #include "content_client_qt.h" #include "download_manager_delegate_qt.h" #include "net/url_request_context_getter_qt.h" @@ -489,6 +490,10 @@ void ProfileAdapter::installUrlSchemeHandler(const QByteArray &scheme, QWebEngin qWarning("URL scheme handler already installed for the scheme: %s", scheme.constData()); return; } + if (QWebEngineUrlScheme::schemeByName(canonicalScheme) == QWebEngineUrlScheme()) + qWarning("Please register the custom scheme '%s' via QWebEngineUrlScheme::registerScheme() " + "before installing the custom scheme handler.", scheme.constData()); + m_customUrlSchemeHandlers.insert(canonicalScheme, handler); updateCustomUrlSchemeHandlers(); } |