diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2017-07-03 16:09:32 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-07-04 09:48:20 +0000 |
commit | f1186db27f95b9a90744d0f9920fe33b497d0774 (patch) | |
tree | c7e1763290a1093b18665bc59603f546c7f08ab6 /src/quicktemplates2 | |
parent | 787ffd2f10bfa98d183dbf43851588406c9ca63e (diff) |
Doc: revise the custom menu example
Use a single example for the whole menu. We can now use Actions and the
delegate property to use the styled menu item for the whole menu. The same
structure will be used for the upcoming MenuBar example.
Change-Id: Idbaa38cc536b27a4d64eb9ad72c07936bf160d6e
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2')
-rw-r--r-- | src/quicktemplates2/qquickmenu.cpp | 2 | ||||
-rw-r--r-- | src/quicktemplates2/qquickmenuitem.cpp | 4 | ||||
-rw-r--r-- | src/quicktemplates2/qquickmenuseparator.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/quicktemplates2/qquickmenu.cpp b/src/quicktemplates2/qquickmenu.cpp index 8ac7e303..f91498fd 100644 --- a/src/quicktemplates2/qquickmenu.cpp +++ b/src/quicktemplates2/qquickmenu.cpp @@ -167,7 +167,7 @@ static const int SUBMENU_DELAY = 225; Although \l {MenuItem}{MenuItems} are most commonly used with Menu, it can contain any type of item. - \sa {Customizing Menu}, {Menu Controls}, {Popup Controls} + \sa {Customizing Menu}, MenuItem, {Menu Controls}, {Popup Controls} */ static const QQuickPopup::ClosePolicy defaultMenuClosePolicy = QQuickPopup::CloseOnEscape | QQuickPopup::CloseOnPressOutside; diff --git a/src/quicktemplates2/qquickmenuitem.cpp b/src/quicktemplates2/qquickmenuitem.cpp index c682e13a..3a43dbfa 100644 --- a/src/quicktemplates2/qquickmenuitem.cpp +++ b/src/quicktemplates2/qquickmenuitem.cpp @@ -85,7 +85,7 @@ QT_BEGIN_NAMESPACE } \endcode - \sa {Customizing MenuItem}, {Menu Controls} + \sa {Customizing Menu}, Menu, {Menu Controls} */ QQuickMenuItemPrivate::QQuickMenuItemPrivate() @@ -179,7 +179,7 @@ void QQuickMenuItem::setHighlighted(bool highlighted) This property holds the sub-menu arrow item. - \sa {Customizing MenuItem} + \sa {Customizing Menu} */ QQuickItem *QQuickMenuItem::arrow() const { diff --git a/src/quicktemplates2/qquickmenuseparator.cpp b/src/quicktemplates2/qquickmenuseparator.cpp index f80cc775..dee5287a 100644 --- a/src/quicktemplates2/qquickmenuseparator.cpp +++ b/src/quicktemplates2/qquickmenuseparator.cpp @@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE \printuntil } \printuntil } - \sa {Customizing MenuSeparator}, {Separator Controls} + \sa {Customizing Menu}, Menu, {Separator Controls} */ QQuickMenuSeparator::QQuickMenuSeparator(QQuickItem *parent) |