diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2017-02-28 11:36:55 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-01 12:13:11 +0000 |
| commit | 98ed5ba985f04f342a11d6a8550f843fd053b39d (patch) | |
| tree | e3180ae7b82a024966036b2f4da65f14b2bc8633 | |
| parent | f0d2237177bb97c40c7daace6f2a17bf27f65249 (diff) | |
| download | qtquickcontrols-98ed5ba985f04f342a11d6a8550f843fd053b39d.tar.gz | |
"to the empty string" => "to an empty string"
Change-Id: I62f1fae431ce02c196c6ca582e0d033dbf38d836
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| -rw-r--r-- | src/controls/qquickaction.cpp | 8 | ||||
| -rw-r--r-- | src/controls/qquickmenu.cpp | 6 | ||||
| -rw-r--r-- | src/controls/qquickmenuitem.cpp | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/controls/qquickaction.cpp b/src/controls/qquickaction.cpp index e1c6970b..424f1042 100644 --- a/src/controls/qquickaction.cpp +++ b/src/controls/qquickaction.cpp @@ -86,13 +86,13 @@ QT_BEGIN_NAMESPACE For instance, \c "\&Open" will bind the \c Alt-O shortcut to the \c "Open" menu item. Note that not all platforms support mnemonics. - Defaults to the empty string. + Defaults to an empty string. */ /*! \qmlproperty url Action::iconSource - Sets the icon file or resource url for the action. Defaults to the empty URL. + Sets the icon file or resource url for the action. Defaults to an empty URL. */ /*! @@ -101,7 +101,7 @@ QT_BEGIN_NAMESPACE Sets the icon name for the action. This will pick the icon with the given name from the current theme. - Defaults to the empty string. + Defaults to an empty string. \include icons.qdocinc iconName */ @@ -112,7 +112,7 @@ QT_BEGIN_NAMESPACE Tooltip to be shown when hovering the control bound to this action. Not all controls support tooltips on all platforms, especially \l MenuItem. - Defaults to the empty string. + Defaults to an empty string. */ /*! diff --git a/src/controls/qquickmenu.cpp b/src/controls/qquickmenu.cpp index 67682ad3..d309b67e 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 */ diff --git a/src/controls/qquickmenuitem.cpp b/src/controls/qquickmenuitem.cpp index 733fc638..3c5bfe4b 100644 --- a/src/controls/qquickmenuitem.cpp +++ b/src/controls/qquickmenuitem.cpp @@ -343,7 +343,7 @@ void QQuickMenuText1::updateIcon() For instance, \c "\&Open" will bind the \c Alt-O shortcut to the \c "Open" menu item. Note that not all platforms support mnemonics. - Defaults to the empty string. + Defaults to an empty string. \sa Action::text */ @@ -358,7 +358,7 @@ void QQuickMenuText1::updateIcon() \qmlproperty url MenuItem::iconSource Sets the icon file or resource url for the \l MenuItem icon. - Overrides the item's bound action \c iconSource property. Defaults to the empty URL. + Overrides the item's bound action \c iconSource property. Defaults to an empty URL. \sa iconName, Action::iconSource */ @@ -368,7 +368,7 @@ void QQuickMenuText1::updateIcon() Sets the icon name for the \l MenuItem icon. This will pick the icon with the given name from the current theme. Overrides the item's bound - action \c iconName property. Defaults to the empty string. + action \c iconName property. Defaults to an empty string. \include icons.qdocinc iconName |