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/webenginewidgets/doc | |
| 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/webenginewidgets/doc')
| -rw-r--r-- | src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc index facc0e8e6..fb5ed019e 100644 --- a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc @@ -172,7 +172,7 @@ /*! \enum QWebEngineSettings::UnknownUrlSchemePolicy - \since Qt 5.10 + \since Qt 5.11 This enum describes how navigation requests to URLs with unknown schemes are handled. @@ -184,6 +184,8 @@ from JavaScript) are suppressed. \value AllowAllUnknownUrlSchemes Allows all navigation requests to URLs with unknown schemes. + + \sa unknownUrlSchemePolicy setUnknownUrlSchemePolicy resetUnknownUrlSchemePolicy */ /*! @@ -240,6 +242,7 @@ /*! \fn QWebEngineSettings::UnknownUrlSchemePolicy QWebEngineSettings::unknownUrlSchemePolicy() const + \since Qt 5.11 Returns the currently selected policy for handling navigation requests to URLs with unknown schemes. Default is \l{QWebEngineSettings::AllowUnknownUrlSchemesFromUserInteraction}. \sa setUnknownUrlSchemePolicy resetUnknownUrlSchemePolicy @@ -247,6 +250,7 @@ /*! \fn void QWebEngineSettings::setUnknownUrlSchemePolicy(QWebEngineSettings::UnknownUrlSchemePolicy policy) + \since Qt 5.11 Sets the policy for handling navigation requests to URLs with unknown schemes to \a policy. Default is \l{QWebEngineSettings::AllowUnknownUrlSchemesFromUserInteraction}. \sa unknownUrlSchemePolicy resetUnknownUrlSchemePolicy @@ -254,6 +258,7 @@ /*! \fn void QWebEngineSettings::resetUnknownUrlSchemePolicy() + \since Qt 5.11 Removes the policy for handling navigation requests to URLs with unknown schemes. \sa unknownUrlSchemePolicy setUnknownUrlSchemePolicy */ |