From 9322c67c4281b5d5e4941f9072547fe8054d0f36 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Tue, 14 Jul 2020 15:37:47 +0200 Subject: Doc: mention cache property in the relevant places This was missed in 033564edf5b79e32da63597930e25105a3442f01. Change-Id: I7bc465338d5b9960ad7b746a816cd33efcca1bdc Reviewed-by: Volker Hilsheimer (cherry picked from commit feabd686a31d257638d9cdc80c6dd36e8709e279) Reviewed-by: Qt Cherry-pick Bot --- src/imports/controls/doc/src/includes/qquickicon.qdocinc | 2 ++ src/imports/controls/doc/src/qtquickcontrols2-icons.qdoc | 1 + src/quicktemplates2/qquickabstractbutton.cpp | 1 + src/quicktemplates2/qquickaction.cpp | 1 + 4 files changed, 5 insertions(+) diff --git a/src/imports/controls/doc/src/includes/qquickicon.qdocinc b/src/imports/controls/doc/src/includes/qquickicon.qdocinc index ba7cede9..beef5624 100644 --- a/src/imports/controls/doc/src/includes/qquickicon.qdocinc +++ b/src/imports/controls/doc/src/includes/qquickicon.qdocinc @@ -44,5 +44,7 @@ \li This property specifies whether the icon should be cached. The default value is true. + + This property was introduced in QtQuick.Controls 2.13. \endtable //! [grouped-properties] diff --git a/src/imports/controls/doc/src/qtquickcontrols2-icons.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-icons.qdoc index f8cb1f52..190aafd9 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-icons.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-icons.qdoc @@ -44,6 +44,7 @@ \li \c icon.width \li \c icon.height \li \c icon.color + \li \c icon.cache \endlist Theme icons are referenced by a name, and regular icons by a source URL. Both diff --git a/src/quicktemplates2/qquickabstractbutton.cpp b/src/quicktemplates2/qquickabstractbutton.cpp index 8632e14c..ac62a2a0 100644 --- a/src/quicktemplates2/qquickabstractbutton.cpp +++ b/src/quicktemplates2/qquickabstractbutton.cpp @@ -740,6 +740,7 @@ void QQuickAbstractButton::setIndicator(QQuickItem *indicator) \qmlproperty int QtQuick.Controls::AbstractButton::icon.width \qmlproperty int QtQuick.Controls::AbstractButton::icon.height \qmlproperty color QtQuick.Controls::AbstractButton::icon.color + \qmlproperty bool QtQuick.Controls::AbstractButton::icon.cache This property group was added in QtQuick.Controls 2.3. diff --git a/src/quicktemplates2/qquickaction.cpp b/src/quicktemplates2/qquickaction.cpp index 0b083339..0dab3b97 100644 --- a/src/quicktemplates2/qquickaction.cpp +++ b/src/quicktemplates2/qquickaction.cpp @@ -387,6 +387,7 @@ void QQuickAction::setText(const QString &text) \qmlproperty int QtQuick.Controls::Action::icon.width \qmlproperty int QtQuick.Controls::Action::icon.height \qmlproperty color QtQuick.Controls::Action::icon.color + \qmlproperty bool QtQuick.Controls::Action::icon.cache \include qquickicon.qdocinc grouped-properties */ -- cgit v1.2.3