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/api/qquickwebenginesettings.cpp | |
| parent | 05c6c1b59d59113b81fcb4a5a0388ef98d39ed40 (diff) | |
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/api/qquickwebenginesettings.cpp')
| -rw-r--r-- | src/webengine/api/qquickwebenginesettings.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/webengine/api/qquickwebenginesettings.cpp b/src/webengine/api/qquickwebenginesettings.cpp index fa73af8b2..71af00d30 100644 --- a/src/webengine/api/qquickwebenginesettings.cpp +++ b/src/webengine/api/qquickwebenginesettings.cpp @@ -74,7 +74,7 @@ QQuickWebEngineSettings::~QQuickWebEngineSettings() /*! \enum QQuickWebEngineSettings::UnknownUrlSchemePolicy - \since WebEngine 1.6 + \since WebEngine 1.7 This enum describes how navigation requests to URLs with unknown schemes are handled. @@ -417,7 +417,7 @@ ASSERT_ENUMS_MATCH(QQuickWebEngineSettings::AllowAllUnknownUrlSchemes, WebEngine /*! \qmlproperty WebEngineSettings::UnknownUrlSchemePolicy WebEngineSettings::unknownUrlSchemePolicy - \since QtWebEngine 1.6 + \since QtWebEngine 1.7 Specifies how navigation requests to URLs with unknown schemes are handled. Default is \l{QWebEngineSettings::UnknownUrlSchemePolicy}{WebEngineSettings.AllowUnknownUrlSchemesFromUserInteraction}. |