diff options
Diffstat (limited to 'src/webenginequick/api')
5 files changed, 23 insertions, 32 deletions
diff --git a/src/webenginequick/api/qquickwebengineclientcertificateselection.cpp b/src/webenginequick/api/qquickwebengineclientcertificateselection.cpp index 4d8b38427..3a42366b6 100644 --- a/src/webenginequick/api/qquickwebengineclientcertificateselection.cpp +++ b/src/webenginequick/api/qquickwebengineclientcertificateselection.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE /*! \qmltype WebEngineClientCertificateOption - \instantiates QQuickWebEngineClientCertificateOption + //! \instantiates QQuickWebEngineClientCertificateOption \inqmlmodule QtWebEngine \since QtWebEngine 1.9 \brief Represents a client certificate option. @@ -117,7 +117,7 @@ void QQuickWebEngineClientCertificateOption::select() /*! \qmltype WebEngineClientCertificateSelection - \instantiates QQuickWebEngineClientCertificateSelection + //! \instantiates QQuickWebEngineClientCertificateSelection \inqmlmodule QtWebEngine \since QtWebEngine 1.9 \brief Provides a selection of client certificates. diff --git a/src/webenginequick/api/qquickwebenginedialogrequests.cpp b/src/webenginequick/api/qquickwebenginedialogrequests.cpp index da1aecaf6..5d56d6b75 100644 --- a/src/webenginequick/api/qquickwebenginedialogrequests.cpp +++ b/src/webenginequick/api/qquickwebenginedialogrequests.cpp @@ -71,7 +71,7 @@ ASSERT_ENUMS_MATCH(FilePickerController::Save, /*! \qmltype AuthenticationDialogRequest - \instantiates QQuickWebEngineAuthenticationDialogRequest + //! \instantiates QQuickWebEngineAuthenticationDialogRequest \inqmlmodule QtWebEngine \since QtWebEngine 1.4 @@ -246,7 +246,7 @@ void QQuickWebEngineAuthenticationDialogRequest::dialogReject() /*! \qmltype JavaScriptDialogRequest - \instantiates QQuickWebEngineJavaScriptDialogRequest + //! \instantiates QQuickWebEngineJavaScriptDialogRequest \inqmlmodule QtWebEngine \since QtWebEngine 1.4 @@ -441,7 +441,7 @@ void QQuickWebEngineJavaScriptDialogRequest::dialogReject() /*! \qmltype ColorDialogRequest - \instantiates QQuickWebEngineColorDialogRequest + //! \instantiates QQuickWebEngineColorDialogRequest \inqmlmodule QtWebEngine \since QtWebEngine 1.4 @@ -560,7 +560,7 @@ void QQuickWebEngineColorDialogRequest::dialogReject() /*! \qmltype FileDialogRequest - \instantiates QQuickWebEngineFileDialogRequest + //! \instantiates QQuickWebEngineFileDialogRequest \inqmlmodule QtWebEngine \since QtWebEngine 1.4 @@ -716,7 +716,7 @@ void QQuickWebEngineFileDialogRequest::dialogReject() /*! \qmltype FormValidationMessageRequest - \instantiates QQuickWebEngineFormValidationMessageRequest + //! \instantiates QQuickWebEngineFormValidationMessageRequest \inqmlmodule QtWebEngine \since QtWebEngine 1.4 \obsolete @@ -830,7 +830,7 @@ void QQuickWebEngineFormValidationMessageRequest::setAccepted(bool accepted) /*! \qmltype TooltipRequest - \instantiates QQuickWebEngineTooltipRequest + //! \instantiates QQuickWebEngineTooltipRequest \inqmlmodule QtWebEngine \since QtWebEngine 1.10 diff --git a/src/webenginequick/api/qquickwebengineprofile.cpp b/src/webenginequick/api/qquickwebengineprofile.cpp index d3909418d..1c32c9ffb 100644 --- a/src/webenginequick/api/qquickwebengineprofile.cpp +++ b/src/webenginequick/api/qquickwebengineprofile.cpp @@ -941,10 +941,8 @@ QQuickWebEngineSettings *QQuickWebEngineProfile::settings() const \qmlproperty list<WebEngineScript> WebEngineProfile::userScripts \since 1.5 - Returns the collection of WebEngineScripts that are injected into all pages that share - this profile. - - \sa WebEngineScript + Returns the collection of WebEngineScript objects that are injected into + all pages that share this profile. */ QQuickWebEngineScriptCollection *QQuickWebEngineProfile::userScripts() const diff --git a/src/webenginequick/api/qquickwebenginesettings.cpp b/src/webenginequick/api/qquickwebenginesettings.cpp index f1fd00b8d..aba47dfe6 100644 --- a/src/webenginequick/api/qquickwebenginesettings.cpp +++ b/src/webenginequick/api/qquickwebenginesettings.cpp @@ -54,7 +54,7 @@ QQuickWebEngineSettings::QQuickWebEngineSettings(QQuickWebEngineSettings *parent /*! \qmltype WebEngineSettings - \instantiates QQuickWebEngineSettings + //! \instantiates QQuickWebEngineSettings \inqmlmodule QtWebEngine \since QtWebEngine 1.1 \brief Allows configuration of browser properties and attributes. @@ -73,22 +73,6 @@ QQuickWebEngineSettings::~QQuickWebEngineSettings() { } /*! - \enum QQuickWebEngineSettings::UnknownUrlSchemePolicy - \since WebEngine 1.7 - - This enum describes how navigation requests to URLs with unknown schemes are handled. - - \value DisallowUnknownUrlSchemes - Disallows all navigation requests to URLs with unknown schemes. - \value AllowUnknownUrlSchemesFromUserInteraction - Allows navigation requests to URLs with unknown schemes that are issued from - user-interaction (like a mouse-click), whereas other navigation requests (for example - from JavaScript) are suppressed. - \value AllowAllUnknownUrlSchemes - Allows all navigation requests to URLs with unknown schemes. -*/ - -/*! \qmlproperty bool WebEngineSettings::autoLoadImages Automatically loads images on web pages. @@ -493,11 +477,20 @@ ASSERT_ENUMS_MATCH(QQuickWebEngineSettings::AllowUnknownUrlSchemesFromUserIntera ASSERT_ENUMS_MATCH(QQuickWebEngineSettings::AllowAllUnknownUrlSchemes, QWebEngineSettings::AllowAllUnknownUrlSchemes) /*! - \qmlproperty QWebEngineSettings::UnknownUrlSchemePolicy WebEngineSettings::unknownUrlSchemePolicy + \qmlproperty enumeration WebEngineSettings::unknownUrlSchemePolicy \since QtWebEngine 1.7 Specifies how navigation requests to URLs with unknown schemes are handled. - Default is \l{QWebEngineSettings::UnknownUrlSchemePolicy}{WebEngineSettings.AllowUnknownUrlSchemesFromUserInteraction}. + \value WebEngineSettings.DisallowUnknownUrlSchemes + Disallows all navigation requests to URLs with unknown schemes. + \value WebEngineSettings.AllowUnknownUrlSchemesFromUserInteraction + Allows navigation requests to URLs with unknown schemes that are issued from + user-interaction (like a mouse-click), whereas other navigation requests (for example + from JavaScript) are suppressed. + \value WebEngineSettings.AllowAllUnknownUrlSchemes + Allows all navigation requests to URLs with unknown schemes. + + Default value is \c {WebEngineSettings.AllowUnknownUrlSchemesFromUserInteraction}. */ QQuickWebEngineSettings::UnknownUrlSchemePolicy QQuickWebEngineSettings::unknownUrlSchemePolicy() const { diff --git a/src/webenginequick/api/qquickwebenginesingleton.cpp b/src/webenginequick/api/qquickwebenginesingleton.cpp index 05f38e34e..a35404aa8 100644 --- a/src/webenginequick/api/qquickwebenginesingleton.cpp +++ b/src/webenginequick/api/qquickwebenginesingleton.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE /*! \qmltype WebEngine - \instantiates QQuickWebEngineSingleton + //! \instantiates QQuickWebEngineSingleton \inqmlmodule QtWebEngine \since QtWebEngine 1.1 \brief Provides access to the default settings and profiles shared by all web engine views. |