diff options
Diffstat (limited to 'src/gui/kernel/qaction.h')
| -rw-r--r-- | src/gui/kernel/qaction.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/gui/kernel/qaction.h b/src/gui/kernel/qaction.h index 54cfb8a50b..d805599138 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 @@ -74,7 +74,7 @@ public: QList<QObject *> associatedObjects() const; #if QT_DEPRECATED_SINCE(6,0) -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC QWidget *parentWidget() const; QList<QWidget*> associatedWidgets() const; QList<QGraphicsWidget*> associatedGraphicsWidgets() const; @@ -84,6 +84,7 @@ public: QWidget, QMenu, and QGraphicsWidget can be expected to be fully defined. */ template<typename T = QWidget*> + QT_DEPRECATED_VERSION_X_6_0("Use parent() with qobject_cast() instead") T parentWidget() const { auto result = parent(); @@ -93,6 +94,7 @@ public: } template<typename T = QWidget*> + QT_DEPRECATED_VERSION_X_6_0("Use associatedObjects() with qobject_cast() instead") QList<T> associatedWidgets() const { QList<T> result; @@ -102,6 +104,7 @@ public: return result; } template<typename T = QGraphicsWidget*> + QT_DEPRECATED_VERSION_X_6_0("Use associatedObjects() with qobject_cast() instead") QList<T> associatedGraphicsWidgets() const { QList<T> result; @@ -175,8 +178,7 @@ public: void setMenuRole(MenuRole menuRole); MenuRole menuRole() const; -#if QT_DEPRECATED_SINCE(6,0) -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC QMenu *menu() const; void setMenu(QMenu *menu); #else @@ -191,7 +193,6 @@ public: setMenuObject(m); } #endif -#endif void setIconVisibleInMenu(bool visible); bool isIconVisibleInMenu() const; |