diff --git a/src/gui/kernel/qaction.cpp b/src/gui/kernel/qaction.cpp index 8ee6a06ad8..98cbc9c3d5 100644 --- a/src/gui/kernel/qaction.cpp +++ b/src/gui/kernel/qaction.cpp @@ -1191,14 +1191,13 @@ QAction::MenuRole QAction::menuRole() const /*! \fn QMenu *QAction::menu() const - \deprecated Use QMenu::menuInAction instead. Returns the menu contained by this action. In widget applications, actions that contain menus can be used to create menu items with submenus, or inserted into toolbars to create buttons with popup menus. - \sa QMenu::addAction() + \sa QMenu::addAction(), QMenu::menuInAction() */ QObject* QAction::menuObject() const { @@ -1208,7 +1207,6 @@ QObject* QAction::menuObject() const /*! \fn void QAction::setMenu(QMenu *menu) - \deprecated Sets the menu contained by this action to the specified \a menu. */ diff --git a/src/gui/kernel/qaction.h b/src/gui/kernel/qaction.h index 54cfb8a50b..cc85466614 100644 --- a/src/gui/kernel/qaction.h +++ b/src/gui/kernel/qaction.h @@ -20,10 +20,10 @@ QT_BEGIN_NAMESPACE class QActionEvent; class QActionGroup; class QActionPrivate; +class QMenu; #if QT_DEPRECATED_SINCE(6,0) class QWidget; class QGraphicsWidget; -class QMenu; #endif class Q_GUI_EXPORT QAction : public QObject @@ -175,7 +175,6 @@ public: void setMenuRole(MenuRole menuRole); MenuRole menuRole() const; -#if QT_DEPRECATED_SINCE(6,0) #ifdef Q_CLANG_QDOC QMenu *menu() const; void setMenu(QMenu *menu); @@ -190,7 +189,6 @@ public: { setMenuObject(m); } -#endif #endif void setIconVisibleInMenu(bool visible);