diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-31 09:04:18 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-31 09:04:18 +0200 |
| commit | 9f085b889524a80d4064d6ac01dbdc817bb31060 (patch) | |
| tree | a65a8871f44a0572e1459dd14759b2339f93de5e /src/controls/qquickmenu.cpp | |
| parent | 9a56985c91d16d7c42ba86f4b0a70f85973e0618 (diff) | |
| parent | 8c37d58fa21fd3cf6897e2d7d4fe1f73c983d2f4 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: Ia574913a1c2af6349db33966c172e96f6eb5f127
Diffstat (limited to 'src/controls/qquickmenu.cpp')
| -rw-r--r-- | src/controls/qquickmenu.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/controls/qquickmenu.cpp b/src/controls/qquickmenu.cpp index 67682ad34..d309b67e8 100644 --- a/src/controls/qquickmenu.cpp +++ b/src/controls/qquickmenu.cpp @@ -133,7 +133,7 @@ QT_BEGIN_NAMESPACE For instance, \c "\&File" will bind the \c Alt-F shortcut to the \c "File" menu. Note that not all platforms support mnemonics. - Its value defaults to the empty string. + Its value defaults to an empty string. */ /*! @@ -147,7 +147,7 @@ QT_BEGIN_NAMESPACE \qmlproperty url Menu::iconSource Sets the icon file or resource url for the menu icon as a submenu. - Defaults to the empty URL. + Defaults to an empty URL. \sa iconName */ @@ -158,7 +158,7 @@ QT_BEGIN_NAMESPACE Sets the icon name for the menu icon. This will pick the icon with the given name from the current theme. Only works as a submenu. - Its value defaults to the empty string. + Its value defaults to an empty string. \sa iconSource */ |