diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2025-09-15 17:12:59 +0200 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@qt.io> | 2025-10-30 11:15:23 +0000 |
| commit | 5155a453f3c96d25ac90f0e14285afcec05a2dae (patch) | |
| tree | 00a0e448c83a7e2a5c8a779344f64856aa929f79 | |
| parent | ab20d0c1827b53394bcf53dc925e3ae9708fc491 (diff) | |
Fix QWebEngineDesktopMediaRequest registration
Qml type registration complains about "...nor a default-
and copy-constructible Q_GADGET..."
Therefore change to be value type, add default constructor.
This amends 6f4315175d4c7846c0591954ed03b14d405c9a90.
Pick-to: 6.10
Fixes: QTBUG-141112
Change-Id: Ib230e3766bac2451d58da903ad1c1d44e5519862
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| -rw-r--r-- | src/core/api/qwebenginedesktopmediarequest.cpp | 1 | ||||
| -rw-r--r-- | src/core/api/qwebenginedesktopmediarequest.h | 1 | ||||
| -rw-r--r-- | src/webenginequick/api/qquickwebengineforeigntypes_p.h | 16 |
3 files changed, 10 insertions, 8 deletions
diff --git a/src/core/api/qwebenginedesktopmediarequest.cpp b/src/core/api/qwebenginedesktopmediarequest.cpp index d965522bc..448ca4a8d 100644 --- a/src/core/api/qwebenginedesktopmediarequest.cpp +++ b/src/core/api/qwebenginedesktopmediarequest.cpp @@ -145,6 +145,7 @@ QWebEngineDesktopMediaRequest::QWebEngineDesktopMediaRequest( { } +QWebEngineDesktopMediaRequest::QWebEngineDesktopMediaRequest() = default; QWebEngineDesktopMediaRequest::~QWebEngineDesktopMediaRequest() = default; QWebEngineDesktopMediaRequest::QWebEngineDesktopMediaRequest( diff --git a/src/core/api/qwebenginedesktopmediarequest.h b/src/core/api/qwebenginedesktopmediarequest.h index c8cc6d817..e173c482e 100644 --- a/src/core/api/qwebenginedesktopmediarequest.h +++ b/src/core/api/qwebenginedesktopmediarequest.h @@ -28,6 +28,7 @@ class QWebEngineDesktopMediaRequest Q_PROPERTY(QAbstractListModel *windowsModel READ windowsModel FINAL) public: + Q_WEBENGINECORE_EXPORT QWebEngineDesktopMediaRequest(); Q_WEBENGINECORE_EXPORT ~QWebEngineDesktopMediaRequest(); Q_WEBENGINECORE_EXPORT diff --git a/src/webenginequick/api/qquickwebengineforeigntypes_p.h b/src/webenginequick/api/qquickwebengineforeigntypes_p.h index 87f6c6982..2c26172d6 100644 --- a/src/webenginequick/api/qquickwebengineforeigntypes_p.h +++ b/src/webenginequick/api/qquickwebengineforeigntypes_p.h @@ -113,14 +113,6 @@ struct ForeignWebEngineWebAuthUxRequest QML_UNCREATABLE("") }; -struct ForeignWebEngineDesktopMediaRequest -{ - Q_GADGET - QML_FOREIGN(QWebEngineDesktopMediaRequest) - QML_ANONYMOUS - QML_ADDED_IN_VERSION(6, 10) -}; - struct ForeignWebEngineClientHints : public QObject { Q_OBJECT @@ -143,6 +135,14 @@ struct ForeignWebEngineExtensionManager // QML value types +struct ForeignWebEngineDesktopMediaRequest +{ + Q_GADGET + QML_FOREIGN(QWebEngineDesktopMediaRequest) + QML_VALUE_TYPE(webEngineDesktopMediaRequest) + QML_ADDED_IN_VERSION(6, 10) +}; + CREATE_DERIVED_FOREIGN_NAMESPACE(QWebEngineLoadingInfo) namespace ForeignWebEngineLoadingInfoNamespace |