summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
m---------src/3rdparty0
-rw-r--r--src/core/api/qwebengineextensioninfo.h3
-rw-r--r--src/core/api/qwebengineextensionmanager.h4
-rw-r--r--src/core/web_engine_context.cpp2
-rw-r--r--src/webenginequick/api/qquickwebengineforeigntypes_p.h24
-rw-r--r--src/webenginequick/api/qquickwebenginescriptcollection.cpp18
6 files changed, 34 insertions, 17 deletions
diff --git a/src/3rdparty b/src/3rdparty
-Subproject b5f55adaf3d2479cc4f866e0f1a616b67e09311
+Subproject e94c0f365f3fb987670f082365628000bf59eb4
diff --git a/src/core/api/qwebengineextensioninfo.h b/src/core/api/qwebengineextensioninfo.h
index 1c242dcb2..413f29477 100644
--- a/src/core/api/qwebengineextensioninfo.h
+++ b/src/core/api/qwebengineextensioninfo.h
@@ -36,9 +36,6 @@ class QWebEngineExtensionInfo
Q_PROPERTY(bool isInstalled READ isInstalled FINAL)
public:
- QML_VALUE_TYPE(webEngineExtension)
- QML_ADDED_IN_VERSION(6, 10)
-
Q_WEBENGINECORE_EXPORT QWebEngineExtensionInfo();
Q_WEBENGINECORE_EXPORT
diff --git a/src/core/api/qwebengineextensionmanager.h b/src/core/api/qwebengineextensionmanager.h
index 15919605d..0fc6d3e01 100644
--- a/src/core/api/qwebengineextensionmanager.h
+++ b/src/core/api/qwebengineextensionmanager.h
@@ -27,10 +27,6 @@ class Q_WEBENGINECORE_EXPORT QWebEngineExtensionManager : public QObject
Q_PROPERTY(QString installPath READ installPath FINAL)
Q_PROPERTY(QList<QWebEngineExtensionInfo> extensions READ extensions FINAL)
public:
- QML_NAMED_ELEMENT(WebEngineExtensionManager)
- QML_UNCREATABLE("")
- QML_ADDED_IN_VERSION(6, 10)
-
~QWebEngineExtensionManager() override;
Q_INVOKABLE void loadExtension(const QString &path);
Q_INVOKABLE void installExtension(const QString &path);
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index 72fd4c3a8..0b16c8760 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -1242,7 +1242,7 @@ const char *qWebEngineChromiumVersion() noexcept
const char *qWebEngineChromiumSecurityPatchVersion() noexcept
{
- return "134.0.6998.208"; // FIXME: Remember to update
+ return "139.0.7258.67"; // FIXME: Remember to update
}
QT_END_NAMESPACE
diff --git a/src/webenginequick/api/qquickwebengineforeigntypes_p.h b/src/webenginequick/api/qquickwebengineforeigntypes_p.h
index be10af081..c2892d33c 100644
--- a/src/webenginequick/api/qquickwebengineforeigntypes_p.h
+++ b/src/webenginequick/api/qquickwebengineforeigntypes_p.h
@@ -36,6 +36,11 @@
#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
// To prevent the same type from being exported twice into qmltypes
@@ -284,6 +289,25 @@ struct ForeignWebEngineClientHints : public QObject
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/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
{