From 41c95615fc6f58d584f5658d062e35fda17dc3f8 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Fri, 3 Nov 2023 11:36:27 +0000 Subject: [PATCH] Doc: Fix \fn template arguments for Qt Widgets Upcoming changes to QDoc require accurate definition for template arguments in \fn commands. Task-number: QTBUG-118080 Change-Id: I3a193ca69a911ee2f62e7663aaf4c032a35ee5dd Reviewed-by: Luca Di Sera --- src/widgets/graphicsview/qgraphicsitem.cpp | 2 +- src/widgets/kernel/qwidget.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/widgets/graphicsview/qgraphicsitem.cpp b/src/widgets/graphicsview/qgraphicsitem.cpp index cf9e16e292..17ea830cab 100644 --- a/src/widgets/graphicsview/qgraphicsitem.cpp +++ b/src/widgets/graphicsview/qgraphicsitem.cpp @@ -6501,7 +6501,7 @@ void QGraphicsItem::setData(int key, const QVariant &value) } /*! - \fn T qgraphicsitem_cast(QGraphicsItem *item) + \fn template qgraphicsitem_cast(QGraphicsItem *item) \relates QGraphicsItem \since 4.2 diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index afa94ac54f..23340ea5e5 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -3314,10 +3314,10 @@ QAction *QWidget::addAction(const QIcon &icon, const QString &text, const QKeySe #endif // QT_CONFIG(shortcut) /*! - \fn template QAction *QWidget::addAction(const QString &text, Args&&...args) - \fn template QAction *QWidget::addAction(const QString &text, const QKeySequence &shortcut, Args&&...args) - \fn template QAction *QWidget::addAction(const QIcon &icon, const QString &text, Args&&...args) - \fn template QAction *QWidget::addAction(const QIcon &icon, const QString &text, const QKeySequence &shortcut, Args&&...args) + \fn template> QAction *QWidget::addAction(const QString &text, Args&&...args) + \fn template> QAction *QWidget::addAction(const QString &text, const QKeySequence &shortcut, Args&&...args) + \fn template> QAction *QWidget::addAction(const QIcon &icon, const QString &text, Args&&...args) + \fn template> QAction *QWidget::addAction(const QIcon &icon, const QString &text, const QKeySequence &shortcut, Args&&...args) \since 6.3 \overload