diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-02-05 12:35:34 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-02-06 13:16:09 +0000 |
| commit | 7280a42c2591609d574ad407189a491f06f04f9d (patch) | |
| tree | f94cbcab0357c5ba7b0716ebcafca1df984f18cc /src/imports/controls/doc | |
| parent | 51d8385e7eba662d63b73e2c9fa9b01ddc12cc51 (diff) | |
CheckBox: migrate from label to contentItem
Change-Id: Ie35fc6a9a5424c6f002480fc461b7cd5fe84753b
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/doc')
| -rw-r--r-- | src/imports/controls/doc/images/qtlabscontrols-checkbox-contentItem.png (renamed from src/imports/controls/doc/images/qtlabscontrols-checkbox-label.png) | bin | 2582 -> 2582 bytes | |||
| -rw-r--r-- | src/imports/controls/doc/snippets/qtlabscontrols-checkbox-contentItem.qml (renamed from src/imports/controls/doc/snippets/qtlabscontrols-checkbox-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-checkbox-label.png b/src/imports/controls/doc/images/qtlabscontrols-checkbox-contentItem.png Binary files differindex d5a1ef2e..d5a1ef2e 100644 --- a/src/imports/controls/doc/images/qtlabscontrols-checkbox-label.png +++ b/src/imports/controls/doc/images/qtlabscontrols-checkbox-contentItem.png diff --git a/src/imports/controls/doc/snippets/qtlabscontrols-checkbox-label.qml b/src/imports/controls/doc/snippets/qtlabscontrols-checkbox-contentItem.qml index fcb3a49d..bef150a3 100644 --- a/src/imports/controls/doc/snippets/qtlabscontrols-checkbox-label.qml +++ b/src/imports/controls/doc/snippets/qtlabscontrols-checkbox-contentItem.qml @@ -31,7 +31,7 @@ import Qt.labs.controls 1.0 CheckBox { text: "CheckBox" 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 0cda2dd9..bc901cea 100644 --- a/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc +++ b/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc @@ -75,7 +75,7 @@ \section1 Customizing CheckBox CheckBox consists of three visual items: \l {Control::background}{background}, - \l {AbstractButton::label}{label} and \l {AbstractButton::indicator}{indicator}. + \l {Control::contentItem}{contentItem} and \l {AbstractButton::indicator}{indicator}. \section3 Background @@ -83,11 +83,11 @@ CheckBox has no background item by default. - \section3 Label + \section3 Content item - \image qtlabscontrols-checkbox-label.png + \image qtlabscontrols-checkbox-contentItem.png - \snippet CheckBox.qml label + \snippet CheckBox.qml contentItem \section3 Indicator |
