aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2024-07-11 19:05:26 +0200
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2024-07-12 12:34:24 +0200
commit8c41654e1577d08b8ef8212df58b65cf8eb6210f (patch)
treeef0037b0cea00c796567ab1a536f2ca1864ff253
parent8c8d09c0031755e28be84b4f9b3ae27769633001 (diff)
Doc: fix links in the Menu classes
Pick-to: 6.8 Change-Id: I09a509df0044ae0fbd2043068e769c08ac5ae154 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
-rw-r--r--src/quicktemplates/qquickmenu.cpp4
-rw-r--r--src/quicktemplates/qquickmenubar.cpp8
2 files changed, 6 insertions, 6 deletions
diff --git a/src/quicktemplates/qquickmenu.cpp b/src/quicktemplates/qquickmenu.cpp
index 56bc3a2335..e11baab126 100644
--- a/src/quicktemplates/qquickmenu.cpp
+++ b/src/quicktemplates/qquickmenu.cpp
@@ -272,7 +272,7 @@ static const int SUBMENU_DELAY = 225;
Those menus, and all of their contents, will therefore be rendered by the platform, and
not by QML. This means that the \l delegate will \e not be used for rendering. It will,
however, always be instantiated (but hidden), so that functions such as
- \l {Component.onCompleted()} execute regardless of platform and
+ \l [QML] {QtQml::Component::completed}{onCompleted()} execute regardless of platform and
\l [QML] {Popup::} {popupType}.
\section3 Supported platforms
@@ -287,7 +287,7 @@ static const int SUBMENU_DELAY = 225;
\li Windows
\endlist
- \sa {Popup type}, popupType
+ \sa {Popup type}, [QML] {Popup::}{popupType}
*/
/*!
diff --git a/src/quicktemplates/qquickmenubar.cpp b/src/quicktemplates/qquickmenubar.cpp
index 76f06adc16..dbd532ea0c 100644
--- a/src/quicktemplates/qquickmenubar.cpp
+++ b/src/quicktemplates/qquickmenubar.cpp
@@ -728,8 +728,8 @@ void QQuickMenuBar::insertMenu(int index, QQuickMenu *menu)
/*!
\qmlmethod void QtQuick.Controls::MenuBar::removeMenu(Menu menu)
- Removes specified \a menu. If the menu is \l {QQuickMenu::popup(QQmlV4Function *)}{open},
- it will first be \l {QQuickMenu::dismiss()}{dismissed.}
+ Removes specified \a menu. If the menu is \l {Menu::popup()}{open},
+ it will first be \l {Menu::dismiss()}{dismissed}.
The \a menu will eventually be deleted by the garbage collector when the
application no longer holds any QML references to it.
*/
@@ -749,8 +749,8 @@ void QQuickMenuBar::removeMenu(QQuickMenu *menu)
\qmlmethod Menu QtQuick.Controls::MenuBar::takeMenu(int index)
Removes and returns the menu at \a index. If the menu is
- \l {QQuickMenu::popup(QQmlV4Function *)}{open}, it will first be
- \l {QQuickMenu::dismiss()}{dismissed.}
+ \l {Menu::popup()}{open}, it will first be
+ \l {Menu::dismiss()}{dismissed}.
The menu will eventually be deleted by the garbage collector when the
application no longer holds any QML references to it.
*/