diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2018-02-28 15:38:23 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-04-05 21:33:07 +0000 |
| commit | 7d545f6bb6c4bf698410fe4b8f8628cd9715ab0b (patch) | |
| tree | c81008d32083523046ebd8dad1e7fafd82e9631b /src/webenginewidgets/api | |
| parent | a5ced3ad19e2ada6a0ed5a48de21d2879ba2f333 (diff) | |
Replace deprecated Q_FLAGS macro
Q_FLAGS is deprecated, and is replaced by the more powerful Q_FLAG macro.
Anyhow, Q_FLAG and Q_FLAGS only makes sense if used inside
a QObject or Q_GADGET. The patch therefore makes QWebEngineContextMenuData
a Q_GADGET.
Change-Id: Icccb373846a645272a7bf29397b930ae80be9b85
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Reviewed-by: Valentin Fokin <fokinv@inf.u-szeged.hu>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/webenginewidgets/api')
| -rw-r--r-- | src/webenginewidgets/api/qwebenginecontextmenudata.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/webenginewidgets/api/qwebenginecontextmenudata.h b/src/webenginewidgets/api/qwebenginecontextmenudata.h index 7c33ee270..24fbd5c09 100644 --- a/src/webenginewidgets/api/qwebenginecontextmenudata.h +++ b/src/webenginewidgets/api/qwebenginecontextmenudata.h @@ -52,6 +52,8 @@ class WebEngineContextMenuData; QT_BEGIN_NAMESPACE class QWEBENGINEWIDGETS_EXPORT QWebEngineContextMenuData { + Q_GADGET + public: QWebEngineContextMenuData(); QWebEngineContextMenuData(const QWebEngineContextMenuData &other); @@ -82,6 +84,7 @@ public: MediaCanRotate = 0x200, }; Q_DECLARE_FLAGS(MediaFlags, MediaFlag) + Q_FLAG(MediaFlags) // Must match QWebEngineCore::WebEngineContextMenuData::EditFlags: enum EditFlag { @@ -96,6 +99,7 @@ public: CanEditRichly = 0x100, }; Q_DECLARE_FLAGS(EditFlags, EditFlag) + Q_FLAG(EditFlags) bool isValid() const; @@ -116,8 +120,6 @@ private: typedef QtWebEngineCore::WebEngineContextMenuData QWebEngineContextDataPrivate; QWebEngineContextMenuData &operator=(const QWebEngineContextDataPrivate &priv); const QWebEngineContextDataPrivate *d; - Q_FLAGS(MediaFlags) - Q_FLAGS(EditFlags) friend class QWebEnginePagePrivate; friend class QWebEnginePage; |