summaryrefslogtreecommitdiffstats
path: root/src/widgets/widgets/qmenubar.h
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@qt.io>2018-08-10 12:14:05 +0200
committerMartin Smith <martin.smith@qt.io>2018-08-14 17:54:55 +0000
commit109af99261f3a3fd05954ba0f6e01b83c19dcf81 (patch)
treea4c36cf6eedfae81e6ffa9583ddfa9e4fa22a9e3 /src/widgets/widgets/qmenubar.h
parent30e26d258bc69018b7dd6517d816cf36d5606bd3 (diff)
qdoc: Fix several minor errors to reduce qdoc warnings
This update corrects several minor documentation errors that cause qdoc warnings. These include incorrect or missing \fn commands, incorrect uses of \e and \a commands together, incorrect spellings, etc. Change-Id: Ib26edef541fa3440025490bcf79cc101623e7f7b Reviewed-by: Martin Smith <martin.smith@qt.io>
Diffstat (limited to 'src/widgets/widgets/qmenubar.h')
-rw-r--r--src/widgets/widgets/qmenubar.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/widgets/qmenubar.h b/src/widgets/widgets/qmenubar.h
index 2f071e7e3b..cf6663f94a 100644
--- a/src/widgets/widgets/qmenubar.h
+++ b/src/widgets/widgets/qmenubar.h
@@ -67,7 +67,7 @@ public:
QAction *addAction(const QString &text);
QAction *addAction(const QString &text, const QObject *receiver, const char* member);
-#ifdef Q_QDOC
+#ifdef Q_CLANG_QDOC
template<typename Obj, typename PointerToMemberFunctionOrFunctor>
QAction *addAction(const QString &text, const Obj *receiver, PointerToMemberFunctionOrFunctor method);
template<typename Functor>
@@ -91,7 +91,7 @@ public:
connect(result, &QAction::triggered, std::move(slot));
return result;
}
-#endif // !Q_QDOC
+#endif // !Q_CLANG_QDOC
QAction *addMenu(QMenu *menu);
QMenu *addMenu(const QString &title);
@@ -121,7 +121,7 @@ public:
void setCornerWidget(QWidget *w, Qt::Corner corner = Qt::TopRightCorner);
QWidget *cornerWidget(Qt::Corner corner = Qt::TopRightCorner) const;
-#ifdef Q_OS_OSX
+#if defined(Q_OS_MACOS) || defined(Q_CLANG_QDOC)
NSMenu* toNSMenu();
#endif