diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-02-04 17:34:19 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-02-06 13:16:05 +0000 |
| commit | 80941f854f20f02f345fa36c5c2f3626ba0a95ee (patch) | |
| tree | 8802ff717074af3c2597abd63125ff938a5f8009 /src/imports/controls/doc | |
| parent | 9c2e165ac25e2c0601a64aeb65c0254c34b624e8 (diff) | |
ToolButton: migrage from label to contentItem
Change-Id: Iacc8ba21e48f40062d0784c76d33dbf79ce803e0
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/doc')
| -rw-r--r-- | src/imports/controls/doc/images/qtlabscontrols-toolbutton-contentItem.png (renamed from src/imports/controls/doc/images/qtlabscontrols-toolbutton-label.png) | bin | 1682 -> 1682 bytes | |||
| -rw-r--r-- | src/imports/controls/doc/snippets/qtlabscontrols-toolbutton-contentItem.qml (renamed from src/imports/controls/doc/snippets/qtlabscontrols-toolbutton-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-toolbutton-label.png b/src/imports/controls/doc/images/qtlabscontrols-toolbutton-contentItem.png Binary files differindex f4797098..f4797098 100644 --- a/src/imports/controls/doc/images/qtlabscontrols-toolbutton-label.png +++ b/src/imports/controls/doc/images/qtlabscontrols-toolbutton-contentItem.png diff --git a/src/imports/controls/doc/snippets/qtlabscontrols-toolbutton-label.qml b/src/imports/controls/doc/snippets/qtlabscontrols-toolbutton-contentItem.qml index 5a8c3a50..9a25d130 100644 --- a/src/imports/controls/doc/snippets/qtlabscontrols-toolbutton-label.qml +++ b/src/imports/controls/doc/snippets/qtlabscontrols-toolbutton-contentItem.qml @@ -31,7 +31,7 @@ import Qt.labs.controls 1.0 ToolButton { text: "ToolButton" 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 dedda25d..0cda2dd9 100644 --- a/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc +++ b/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc @@ -552,7 +552,7 @@ \section1 Customizing ToolButton ToolButton consists of two visual items: \l {Control::background}{background} - and \l {AbstractButton::label}{label}. + and \l {Control::contentItem}{content item}. \section3 Background @@ -560,11 +560,11 @@ \snippet ToolButton.qml background - \section3 Label + \section3 Content item - \image qtlabscontrols-toolbutton-label.png + \image qtlabscontrols-toolbutton-contentItem.png - \snippet ToolButton.qml label + \snippet ToolButton.qml contentItem \section1 Customizing Tumbler |
