diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-02-04 17:29:24 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-02-06 13:16:02 +0000 |
| commit | 9c2e165ac25e2c0601a64aeb65c0254c34b624e8 (patch) | |
| tree | 242937417a6c5958df68f504b9f2b8174ab0bebd /src/imports/controls/doc | |
| parent | 19b967506deea84a0d56375e5bcca48168a3cfc8 (diff) | |
Button: migrate from label to contentItem
Change-Id: Icccab45dec0dafc907847eb0151b60bd9320ab9a
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/doc')
| -rw-r--r-- | src/imports/controls/doc/images/qtlabscontrols-button-contentItem.png (renamed from src/imports/controls/doc/images/qtlabscontrols-button-label.png) | bin | 1550 -> 1550 bytes | |||
| -rw-r--r-- | src/imports/controls/doc/snippets/qtlabscontrols-button-contentItem.qml (renamed from src/imports/controls/doc/snippets/qtlabscontrols-button-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-button-label.png b/src/imports/controls/doc/images/qtlabscontrols-button-contentItem.png Binary files differindex 73d8f2fb..73d8f2fb 100644 --- a/src/imports/controls/doc/images/qtlabscontrols-button-label.png +++ b/src/imports/controls/doc/images/qtlabscontrols-button-contentItem.png diff --git a/src/imports/controls/doc/snippets/qtlabscontrols-button-label.qml b/src/imports/controls/doc/snippets/qtlabscontrols-button-contentItem.qml index 4fbeab08..ee59ab7f 100644 --- a/src/imports/controls/doc/snippets/qtlabscontrols-button-label.qml +++ b/src/imports/controls/doc/snippets/qtlabscontrols-button-contentItem.qml @@ -32,7 +32,7 @@ Button { width: 80 text: "Button" 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 4aff46a4..dedda25d 100644 --- a/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc +++ b/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc @@ -57,7 +57,7 @@ \section1 Customizing Button Button consists of two visual items: \l {Control::background}{background} - and \l {AbstractButton::label}{label}. + and \l {Control::contentItem}{content item}. \section3 Background @@ -65,11 +65,11 @@ \snippet Button.qml background - \section3 Label + \section3 Content item - \image qtlabscontrols-button-label.png + \image qtlabscontrols-button-contentItem.png - \snippet Button.qml label + \snippet Button.qml contentItem \section1 Customizing CheckBox |
