From 7d545f6bb6c4bf698410fe4b8f8628cd9715ab0b Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Wed, 28 Feb 2018 15:38:23 +0100 Subject: Replace deprecated Q_FLAGS macro MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Valentin Fokin Reviewed-by: Allan Sandfeld Jensen --- src/webengine/api/qquickwebengineview_p.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/webengine/api/qquickwebengineview_p.h') diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h index 76b5c2be9..ffa468eff 100644 --- a/src/webengine/api/qquickwebengineview_p.h +++ b/src/webengine/api/qquickwebengineview_p.h @@ -134,8 +134,6 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineView : public QQuickItem { Q_PROPERTY(QQuickWebEngineTestSupport *testSupport READ testSupport WRITE setTestSupport NOTIFY testSupportChanged FINAL) #endif - Q_FLAGS(FindFlags); - public: QQuickWebEngineView(QQuickItem *parent = 0); ~QQuickWebEngineView(); @@ -296,6 +294,7 @@ public: FindCaseSensitively = 2, }; Q_DECLARE_FLAGS(FindFlags, FindFlag) + Q_FLAG(FindFlags) // must match QPageSize::PageSizeId enum PrintedPageSizeId { -- cgit v1.2.3