diff options
| author | Viktor Engelmann <viktor.engelmann@qt.io> | 2017-09-25 12:52:36 +0200 |
|---|---|---|
| committer | Viktor Engelmann <viktor.engelmann@qt.io> | 2017-09-26 12:25:30 +0000 |
| commit | b04675452f7390476f8ef2d5ead47e5085d113e5 (patch) | |
| tree | 20771059ef9ad7e97b9a27be84423c6c8dca6be3 /src/webengine/plugin/plugin.cpp | |
| parent | 05c6c1b59d59113b81fcb4a5a0388ef98d39ed40 (diff) | |
| download | qtwebengine-b04675452f7390476f8ef2d5ead47e5085d113e5.tar.gz | |
Fix version numbers for UnknownUrlSchemePolicy
As 49c0ce8403e5caeb864f66553f122c68a7c975fb missed feature freeze for
Qt 5.10, the version numbers must be corrected to Qt 5.11, REVISION 6
etc.
Also the auto test was moved into its own source file, so we can
blacklist it on Boot2Qt.
Task-number: QTBUG-58627
Change-Id: I2381e2433ba1b903a62f59a6db58e5f25af77336
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/webengine/plugin/plugin.cpp')
| -rw-r--r-- | src/webengine/plugin/plugin.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/webengine/plugin/plugin.cpp b/src/webengine/plugin/plugin.cpp index 077762352..1568adfbe 100644 --- a/src/webengine/plugin/plugin.cpp +++ b/src/webengine/plugin/plugin.cpp @@ -113,6 +113,7 @@ public: qmlRegisterUncreatableType<QQuickWebEngineSettings, 3>(uri, 1, 4, "WebEngineSettings", tr("Cannot create a separate instance of WebEngineSettings")); qmlRegisterUncreatableType<QQuickWebEngineSettings, 4>(uri, 1, 5, "WebEngineSettings", tr("Cannot create a separate instance of WebEngineSettings")); qmlRegisterUncreatableType<QQuickWebEngineSettings, 5>(uri, 1, 6, "WebEngineSettings", tr("Cannot create a separate instance of WebEngineSettings")); + qmlRegisterUncreatableType<QQuickWebEngineSettings, 6>(uri, 1, 7, "WebEngineSettings", tr("Cannot create a separate instance of WebEngineSettings")); qmlRegisterSingletonType<QQuickWebEngineSingleton>(uri, 1, 1, "WebEngine", webEngineSingletonProvider); qmlRegisterUncreatableType<QQuickWebEngineHistory>(uri, 1, 1, "NavigationHistory", tr("Cannot create a separate instance of NavigationHistory")); |