summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2021-07-24 10:40:55 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-07-26 11:28:12 +0000
commitc56301a55610b760407e67a718d5792a387c713c (patch)
treeffc482813da91a011f3268123af3697d697884e2 /src
parentc2daf61f8158c2b477d33082e0ab13705acbc08d (diff)
QWebEngineNavigationRequest: Prospective fix for clang parsers
The clang parser in Qt for Python and likely qdoc choke at QT_DEPREQT_DEPRECATEDCATED Q_ENUM: QtWebEngineCore/qwebenginenavigationrequest.h:85:19: error: expected member name or ';' after declaration specifiers Properly deprecating the enum would be done by specifying QT_DEPRECATED behind the enum keyword, but that causes deprecation warnings for the setter and getters ( action()/setAction()). Since they are deprecated, too, just remove the deprecation from the enumeration. Amends 13254e7950a032ebbeb11b1cf54b850c8326fb30, Change-Id: I3ecf9b52abc0b5a6e503097b7a1d20c69a1c5f93 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Tismer <tismer@stackless.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 6117b0ffb9a8dab550486dbfa362f7a398ff8f5b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
-rw-r--r--src/core/api/qwebenginenavigationrequest.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/api/qwebenginenavigationrequest.h b/src/core/api/qwebenginenavigationrequest.h
index afa1f46de..f5136b154 100644
--- a/src/core/api/qwebenginenavigationrequest.h
+++ b/src/core/api/qwebenginenavigationrequest.h
@@ -82,7 +82,7 @@ public:
AcceptRequest,
IgnoreRequest = 0xFF
};
- QT_DEPRECATED Q_ENUM(NavigationRequestAction)
+ Q_ENUM(NavigationRequestAction)
private:
Q_PROPERTY(NavigationRequestAction action READ action WRITE setAction NOTIFY actionChanged FINAL)