diff options
Diffstat (limited to 'src/gui/kernel/qshortcut.h')
| -rw-r--r-- | src/gui/kernel/qshortcut.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/kernel/qshortcut.h b/src/gui/kernel/qshortcut.h index dbdf6f97f9..00b9168bea 100644 --- a/src/gui/kernel/qshortcut.h +++ b/src/gui/kernel/qshortcut.h @@ -32,7 +32,7 @@ public: const char *member = nullptr, const char *ambiguousMember = nullptr, Qt::ShortcutContext context = Qt::WindowShortcut); -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC template<typename Functor> QShortcut(const QKeySequence &key, QObject *parent, Functor functor, @@ -170,17 +170,18 @@ public: bool autoRepeat() const; #if QT_DEPRECATED_SINCE(6,0) - Q_DECL_DEPRECATED int id() const; + QT_DEPRECATED_VERSION_6_0 int id() const; #endif void setWhatsThis(const QString &text); QString whatsThis() const; #if QT_DEPRECATED_SINCE(6,0) -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC QWidget *parentWidget() const; #else template<typename T = QWidget*> + QT_DEPRECATED_VERSION_X_6_0("Use parent() and qobject_cast instead") inline T parentWidget() const { return static_cast<T>(QObject::parent()); } #endif |