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/webengine/api/qquickwebengineprofile.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/webengine/api/qquickwebengineprofile.cpp')
-rw-r--r-- | src/webengine/api/qquickwebengineprofile.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/webengine/api/qquickwebengineprofile.cpp b/src/webengine/api/qquickwebengineprofile.cpp index 508106583..22202cc97 100644 --- a/src/webengine/api/qquickwebengineprofile.cpp +++ b/src/webengine/api/qquickwebengineprofile.cpp @@ -53,6 +53,8 @@ #include "renderer_host/user_resource_controller_host.h" #include "web_engine_settings.h" +#include <QtWebEngineCore/qwebengineurlscheme.h> + using QtWebEngineCore::ProfileAdapter; QT_BEGIN_NAMESPACE @@ -904,7 +906,7 @@ const QWebEngineUrlSchemeHandler *QQuickWebEngineProfile::urlSchemeHandler(const /*! Registers a handler \a handler for custom URL scheme \a scheme in the profile. - It is recommended to first register the scheme with \l + It is necessary to first register the scheme with \l QWebEngineUrlScheme::registerScheme at application startup. */ void QQuickWebEngineProfile::installUrlSchemeHandler(const QByteArray &scheme, QWebEngineUrlSchemeHandler *handler) |