diff options
Diffstat (limited to 'src/webenginequick')
5 files changed, 63 insertions, 10 deletions
diff --git a/src/webenginequick/api/qquickwebengineforeigntypes_p.h b/src/webenginequick/api/qquickwebengineforeigntypes_p.h index 58e9a5561..c2892d33c 100644 --- a/src/webenginequick/api/qquickwebengineforeigntypes_p.h +++ b/src/webenginequick/api/qquickwebengineforeigntypes_p.h @@ -33,6 +33,13 @@ #include <QtWebEngineCore/qwebenginefilesystemaccessrequest.h> #include <QtWebEngineCore/qwebenginewebauthuxrequest.h> #include <QtWebEngineCore/qwebenginepermission.h> +#include <QtWebEngineCore/qwebenginedesktopmediarequest.h> +#include <QtWebEngineCore/qwebengineclienthints.h> + +#if QT_CONFIG(webengine_extensions) +#include <QtWebEngineCore/qwebengineextensioninfo.h> +#include <QtWebEngineCore/qwebengineextensionmanager.h> +#endif QT_BEGIN_NAMESPACE @@ -265,6 +272,42 @@ struct ForeignWebEnginePermission QML_UNCREATABLE("") }; +struct ForeignWebEngineDesktopMediaRequest +{ + Q_GADGET + QML_FOREIGN(QWebEngineDesktopMediaRequest) + QML_ANONYMOUS + QML_ADDED_IN_VERSION(6, 10) +}; + +struct ForeignWebEngineClientHints : public QObject +{ + Q_OBJECT + QML_FOREIGN(QWebEngineClientHints) + QML_NAMED_ELEMENT(WebEngineClientHints) + QML_ADDED_IN_VERSION(6, 8) + QML_UNCREATABLE("") +}; + +#if QT_CONFIG(webengine_extensions) +struct ForeignWebEngineExtensionInfo +{ + Q_GADGET + QML_VALUE_TYPE(webEngineExtension) + QML_FOREIGN(QWebEngineExtensionInfo) + QML_ADDED_IN_VERSION(6, 10) +}; + +struct ForeignWebEngineExtensionManager +{ + Q_GADGET + QML_NAMED_ELEMENT(WebEngineExtensionManager) + QML_FOREIGN(QWebEngineExtensionManager) + QML_ADDED_IN_VERSION(6, 10) + QML_UNCREATABLE("") +}; +#endif + QT_END_NAMESPACE #endif // QQUICKWEBENGINEFOREIGNTYPES_H diff --git a/src/webenginequick/api/qquickwebengineprofile.cpp b/src/webenginequick/api/qquickwebengineprofile.cpp index 6aebc18a1..dce3c8822 100644 --- a/src/webenginequick/api/qquickwebengineprofile.cpp +++ b/src/webenginequick/api/qquickwebengineprofile.cpp @@ -96,6 +96,9 @@ QT_BEGIN_NAMESPACE \value AllowPersistentCookies Cookies marked persistent are saved to and restored from disk, whereas session cookies are only stored to disk for crash recovery. This is the default setting. + \value OnlyPersistentCookies + Cookies marked persistent are saved to and restored from disk, whereas session cookies + are never stored to disk, even for crash recovery. \value ForcePersistentCookies Both session and persistent cookies are saved to and restored from disk. */ @@ -726,6 +729,9 @@ void QQuickWebEngineProfile::setHttpCacheType(QQuickWebEngineProfile::HttpCacheT Cookies marked persistent are saved to and restored from disk, whereas session cookies are only stored to disk for crash recovery. This is the default value for non off-the-record profile with storageName. + \value WebEngineProfile.OnlyPersistentCookies + Cookies marked persistent are saved to and restored from disk, whereas session cookies + are never stored to disk, even for crash recovery. \value WebEngineProfile.ForcePersistentCookies Both session and persistent cookies are saved to and restored from disk. */ diff --git a/src/webenginequick/api/qquickwebengineprofile.h b/src/webenginequick/api/qquickwebengineprofile.h index 9a21852ba..899d431a1 100644 --- a/src/webenginequick/api/qquickwebengineprofile.h +++ b/src/webenginequick/api/qquickwebengineprofile.h @@ -65,7 +65,8 @@ public: enum PersistentCookiesPolicy { NoPersistentCookies, AllowPersistentCookies, - ForcePersistentCookies + ForcePersistentCookies, + OnlyPersistentCookies, }; Q_ENUM(PersistentCookiesPolicy) diff --git a/src/webenginequick/api/qquickwebengineprofileprototype.cpp b/src/webenginequick/api/qquickwebengineprofileprototype.cpp index e6c4b8e99..d32d63ce7 100644 --- a/src/webenginequick/api/qquickwebengineprofileprototype.cpp +++ b/src/webenginequick/api/qquickwebengineprofileprototype.cpp @@ -161,6 +161,9 @@ void QQuickWebEngineProfilePrototype::setHttpCacheType( Cookies marked persistent are saved to and restored from disk, whereas session cookies are only stored to disk for crash recovery. This is the default value for non off-the-record profile with storageName. + \value WebEngineProfile.OnlyPersistentCookies + Cookies marked persistent are saved to and restored from disk, whereas session cookies + are never stored to the disk, even for crash recovery. \value WebEngineProfile.ForcePersistentCookies Both session and persistent cookies are saved to and restored from disk. */ diff --git a/src/webenginequick/api/qquickwebenginescriptcollection.cpp b/src/webenginequick/api/qquickwebenginescriptcollection.cpp index 09a8d181e..546633fb1 100644 --- a/src/webenginequick/api/qquickwebenginescriptcollection.cpp +++ b/src/webenginequick/api/qquickwebenginescriptcollection.cpp @@ -59,7 +59,7 @@ webEngineView.userScripts.insert(list) \endcode \endlist - \sa WebEngineScript WebEngineScriptCollection + \sa webEngineScript WebEngineScriptCollection */ @@ -115,7 +115,7 @@ QQuickWebEngineScriptCollection::QQuickWebEngineScriptCollection(QQuickWebEngine QQuickWebEngineScriptCollection::~QQuickWebEngineScriptCollection() { } /*! - \qmlmethod bool WebEngineScriptCollection::contains(WebEngineScript script) + \qmlmethod bool WebEngineScriptCollection::contains(webEngineScript script) \since QtWebEngine 6.2 Returns \c true if the specified \a script is in the collection, \c false otherwise. @@ -128,7 +128,7 @@ bool QQuickWebEngineScriptCollection::contains(const QWebEngineScript &value) co } /*! - \qmlmethod list<WebEngineScript> WebEngineScriptCollection::find(string name) + \qmlmethod list<webEngineScript> WebEngineScriptCollection::find(string name) \since QtWebEngine 6.2 Returns a list of all user script objects with the given \a name. \sa contains() @@ -139,7 +139,7 @@ QList<QWebEngineScript> QQuickWebEngineScriptCollection::find(const QString &nam } /*! - \qmlmethod void WebEngineScriptCollection::insert(WebEngineScript script) + \qmlmethod void WebEngineScriptCollection::insert(webEngineScript script) \since QtWebEngine 6.2 Inserts a single \a script into the collection. \sa remove() @@ -150,9 +150,9 @@ void QQuickWebEngineScriptCollection::insert(const QWebEngineScript &s) } /*! - \qmlmethod void WebEngineScriptCollection::insert(list<WebEngineScript> list) + \qmlmethod void WebEngineScriptCollection::insert(list<webEngineScript> list) \since QtWebEngine 6.2 - Inserts a \a list of WebEngineScript values into the user script collection. + Inserts a \a list of webEngineScript values into the user script collection. \sa remove() */ void QQuickWebEngineScriptCollection::insert(const QList<QWebEngineScript> &list) @@ -161,7 +161,7 @@ void QQuickWebEngineScriptCollection::insert(const QList<QWebEngineScript> &list } /*! - \qmlmethod bool WebEngineScriptCollection::remove(WebEngineScript script) + \qmlmethod bool WebEngineScriptCollection::remove(webEngineScript script) \since QtWebEngine 6.2 Returns \c true if a given \a script is removed from the collection. \sa insert() @@ -182,11 +182,11 @@ void QQuickWebEngineScriptCollection::clear() } /*! - \qmlproperty list<WebEngineScript> WebEngineScriptCollection::collection + \qmlproperty list<webEngineScript> WebEngineScriptCollection::collection \since QtWebEngine 6.2 This property holds a JavaScript array of user script objects. The array can - take WebEngineScript basic type or a JavaScript dictionary as values. + take webEngineScript basic type or a JavaScript dictionary as values. */ QJSValue QQuickWebEngineScriptCollection::collection() const { |