diff options
author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-02-05 13:33:08 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-02-06 13:16:14 +0000 |
commit | 54efc8f33d9c37e8912f5755af588817192a869d (patch) | |
tree | 31bc7b81e95ffccb0e2948f44898941ca49f46c1 /src/imports/controls/doc | |
parent | 802f6b747f4cd76bda4395b6bc06dec81da1110c (diff) |
ItemDelegate: migrate from label to contentItem
Change-Id: I928192b1b5d31e077032cba31f1bde3bf35491f3
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/doc')
-rw-r--r-- | src/imports/controls/doc/images/qtlabscontrols-itemdelegate-contentItem.png (renamed from src/imports/controls/doc/images/qtlabscontrols-itemdelegate-label.png) | bin | 3441 -> 3441 bytes | |||
-rw-r--r-- | src/imports/controls/doc/snippets/qtlabscontrols-itemdelegate-contentItem.qml (renamed from src/imports/controls/doc/snippets/qtlabscontrols-itemdelegate-label.qml) | 2 | ||||
-rw-r--r-- | src/imports/controls/doc/src/qtlabscontrols-customize.qdoc | 8 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/imports/controls/doc/images/qtlabscontrols-itemdelegate-label.png b/src/imports/controls/doc/images/qtlabscontrols-itemdelegate-contentItem.png Binary files differindex 89f094c6..89f094c6 100644 --- a/src/imports/controls/doc/images/qtlabscontrols-itemdelegate-label.png +++ b/src/imports/controls/doc/images/qtlabscontrols-itemdelegate-contentItem.png diff --git a/src/imports/controls/doc/snippets/qtlabscontrols-itemdelegate-label.qml b/src/imports/controls/doc/snippets/qtlabscontrols-itemdelegate-contentItem.qml index 696560a5..43e6f85e 100644 --- a/src/imports/controls/doc/snippets/qtlabscontrols-itemdelegate-label.qml +++ b/src/imports/controls/doc/snippets/qtlabscontrols-itemdelegate-contentItem.qml @@ -33,7 +33,7 @@ ItemDelegate { checked: true checkable: true Rectangle { - anchors.fill: label + anchors.fill: contentItem color: "transparent" border.color: "red" } diff --git a/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc b/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc index 6dc19453..7465d21d 100644 --- a/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc +++ b/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc @@ -205,7 +205,7 @@ \section1 Customizing ItemDelegate ItemDelegate consists of three visual items: \l {Control::background}{background}, - \l {AbstractButton::label}{label} and \l {AbstractButton::indicator}{indicator}. + \l {Control::contentItem}{content item} and \l {AbstractButton::indicator}{indicator}. The indicator is only visible for \l {AbstractButton::checkable}{checkable} items. \section3 Background @@ -214,11 +214,11 @@ \snippet ItemDelegate.qml background - \section3 Label + \section3 Content item - \image qtlabscontrols-itemdelegate-label.png + \image qtlabscontrols-itemdelegate-contentItem.png - \snippet ItemDelegate.qml label + \snippet ItemDelegate.qml contentItem \section3 Indicator |