diff options
| -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 */ |