diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-02-05 15:37:46 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-02-06 13:16:20 +0000 |
| commit | bbed8f6a8554b3edf6198671ee4e36995ba0726b (patch) | |
| tree | 8c07d92d3119d0f48cfff99a6fb1a11c50d7b392 /src/imports/controls/doc | |
| parent | 0cb85683406737dfb715218124c7b2d1936f855b (diff) | |
Switch: migrate from label to contentItem
Change-Id: Ic287fc207b689d5f4a252a527b536272ad94c057
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/doc')
| -rw-r--r-- | src/imports/controls/doc/images/qtlabscontrols-switch-contentItem.png (renamed from src/imports/controls/doc/images/qtlabscontrols-switch-label.png) | bin | 2605 -> 2605 bytes | |||
| -rw-r--r-- | src/imports/controls/doc/snippets/qtlabscontrols-switch-contentItem.qml (renamed from src/imports/controls/doc/snippets/qtlabscontrols-switch-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-switch-label.png b/src/imports/controls/doc/images/qtlabscontrols-switch-contentItem.png Binary files differindex 50f608ab..50f608ab 100644 --- a/src/imports/controls/doc/images/qtlabscontrols-switch-label.png +++ b/src/imports/controls/doc/images/qtlabscontrols-switch-contentItem.png diff --git a/src/imports/controls/doc/snippets/qtlabscontrols-switch-label.qml b/src/imports/controls/doc/snippets/qtlabscontrols-switch-contentItem.qml index c739bf57..99f2af7e 100644 --- a/src/imports/controls/doc/snippets/qtlabscontrols-switch-label.qml +++ b/src/imports/controls/doc/snippets/qtlabscontrols-switch-contentItem.qml @@ -31,7 +31,7 @@ import Qt.labs.controls 1.0 Switch { text: "Switch" 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 7465d21d..0d9af2c8 100644 --- a/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc +++ b/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc @@ -484,7 +484,7 @@ \section1 Customizing Switch Switch 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}. \section3 Background @@ -492,11 +492,11 @@ Switch has no background item by default. - \section3 Label + \section3 Content item - \image qtlabscontrols-switch-label.png + \image qtlabscontrols-switch-contentItem.png - \snippet Switch.qml label + \snippet Switch.qml contentItem \section3 Indicator |
