diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-10-12 11:48:59 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-10-12 11:48:59 +0200 |
| commit | b311ed261a1176c52e68bf8b23bd4040ac12c7c0 (patch) | |
| tree | 8ae99a01cb656d564ac288035516cf5101706a18 /src/imports/controls | |
| parent | 50576aeb67e1470c9c5d2b52650bede1aa6b5697 (diff) | |
| parent | 0007db13236fcee4ca90b885a67cc7de0f40836d (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
src/quicktemplates2/qquickbuttongroup.cpp
src/quicktemplates2/qquickoverlay.cpp
tests/auto/controls/data/tst_buttongroup.qml
Change-Id: Iae23aaf039c6095007966475294e93220dbead84
Diffstat (limited to 'src/imports/controls')
| -rw-r--r-- | src/imports/controls/doc/images/qtquickcontrols2-groupbox-custom.png | bin | 3885 -> 3551 bytes | |||
| -rw-r--r-- | src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-custom.qml | 8 | ||||
| -rw-r--r-- | src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml | 4 |
3 files changed, 10 insertions, 2 deletions
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-groupbox-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-groupbox-custom.png Binary files differindex 29f0a60d..3a585d9f 100644 --- a/src/imports/controls/doc/images/qtquickcontrols2-groupbox-custom.png +++ b/src/imports/controls/doc/images/qtquickcontrols2-groupbox-custom.png diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-custom.qml index feafe263..cdab3e62 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-custom.qml @@ -42,6 +42,14 @@ GroupBox { radius: 2 } + label: Label { + x: control.leftPadding + width: control.availableWidth + text: control.title + color: "#21be2b" + elide: Text.ElideRight + } + Label { text: qsTr("Content goes here!") } diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml index 9eb3d71c..7fa76f13 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml @@ -56,8 +56,8 @@ ListView { easing.type: Easing.InOutQuad } PropertyAction { - target: swipeDelegate; - property: "ListView.delayRemove"; + target: swipeDelegate + property: "ListView.delayRemove" value: false } } |
