diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2017-02-28 11:24:01 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-01 12:13:07 +0000 |
| commit | f0d2237177bb97c40c7daace6f2a17bf27f65249 (patch) | |
| tree | cad3b73a8c358eace9b6d6f18d9e56fee6bc35ed | |
| parent | 704045bc0326e4950f87504f3f67cbfabcd0b5e5 (diff) | |
| download | qtquickcontrols-f0d2237177bb97c40c7daace6f2a17bf27f65249.tar.gz | |
Note that iconName requires QApplication
Task-number: QTBUG-37083
Change-Id: I3091776f4b4643136e67c9521efddb5462657d06
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| -rw-r--r-- | src/controls/Private/BasicButton.qml | 2 | ||||
| -rw-r--r-- | src/controls/doc/includes/icons.qdocinc | 3 | ||||
| -rw-r--r-- | src/controls/qquickaction.cpp | 2 | ||||
| -rw-r--r-- | src/controls/qquickmenuitem.cpp | 2 |
4 files changed, 9 insertions, 0 deletions
diff --git a/src/controls/Private/BasicButton.qml b/src/controls/Private/BasicButton.qml index 437ab407..a9ca4c48 100644 --- a/src/controls/Private/BasicButton.qml +++ b/src/controls/Private/BasicButton.qml @@ -122,6 +122,8 @@ Control { /*! The image label source as theme name. When an icon from the platform icon theme is found, this takes precedence over iconSource. + + \include icons.qdocinc iconName */ property string iconName: action ? action.iconName : "" diff --git a/src/controls/doc/includes/icons.qdocinc b/src/controls/doc/includes/icons.qdocinc new file mode 100644 index 00000000..37bc3758 --- /dev/null +++ b/src/controls/doc/includes/icons.qdocinc @@ -0,0 +1,3 @@ +//! [iconName] +\note This property requires \l QApplication. +//! [iconName] diff --git a/src/controls/qquickaction.cpp b/src/controls/qquickaction.cpp index f04b13ab..e1c6970b 100644 --- a/src/controls/qquickaction.cpp +++ b/src/controls/qquickaction.cpp @@ -102,6 +102,8 @@ QT_BEGIN_NAMESPACE with the given name from the current theme. Defaults to the empty string. + + \include icons.qdocinc iconName */ /*! diff --git a/src/controls/qquickmenuitem.cpp b/src/controls/qquickmenuitem.cpp index 33acff9e..733fc638 100644 --- a/src/controls/qquickmenuitem.cpp +++ b/src/controls/qquickmenuitem.cpp @@ -370,6 +370,8 @@ void QQuickMenuText1::updateIcon() with the given name from the current theme. Overrides the item's bound action \c iconName property. Defaults to the empty string. + \include icons.qdocinc iconName + \sa iconSource, Action::iconName */ |