diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2013-03-20 20:45:43 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-21 12:01:39 +0100 |
| commit | 1636cb60845356de277b2ffac3aa8305c41ee56b (patch) | |
| tree | 498ae44c4312f1bccae1da7d670e23a0d8e1f836 /src/controls/Menu.qml | |
| parent | ccdabc99f81770ad62f7a95f14668cefcb35160e (diff) | |
| download | qtquickcontrols-1636cb60845356de277b2ffac3aa8305c41ee56b.tar.gz | |
Several documentation improvements
Includes Menu, MenuItem, Action, and ExclusiveGroup.
Change-Id: I447c36fe361bbad2f5a31584f242601a150832fa
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/controls/Menu.qml')
| -rw-r--r-- | src/controls/Menu.qml | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/controls/Menu.qml b/src/controls/Menu.qml index 6ac930ef..6c2d3cc4 100644 --- a/src/controls/Menu.qml +++ b/src/controls/Menu.qml @@ -46,8 +46,8 @@ import "Styles/Settings.js" as Settings /*! \qmltype Menu \inqmlmodule QtQuick.Controls 1.0 - \ingroup applicationwindow - \brief Provides a menu component for use in menu bars, context menus, + \ingroup menus + \brief Provides a menu component for use in menu bars, as context menu, and other popup menus. \code @@ -85,14 +85,14 @@ import "Styles/Settings.js" as Settings \endcode The main uses for menus: - \table - \row + \list + \li as a \e top-level menu in a \l MenuBar - \row + \li as a \e submenu inside another menu - \row + \li as a standalone or \e context menu - \endtable + \endlist Note that some properties, such as \c enabled, \c text, or \c iconSource, only make sense in a particular use case of the menu. @@ -103,8 +103,10 @@ import "Styles/Settings.js" as Settings MenuPrivate { id: root - /*! - Adds a submenu to the menu. Returns the newly created \l Menu. + /*! \internal + \omit + See qtmenu.cpp. + \endomit */ function addMenu(title) { if (!__selfComponent) @@ -114,7 +116,7 @@ MenuPrivate { return submenu } - /*! internal */ + /*! \internal */ property Component __selfComponent: null /*! \internal */ |