aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2018-01-17 15:52:55 +0100
committerJ-P Nurmi <jpnurmi@qt.io>2018-01-18 11:29:35 +0000
commit47168eb73bbe888042a1735e424ae35c9af04e2f (patch)
tree66440b1e9c184c32022fc269c14cd0aed3770819
parentc9cbee192263998bd3a9fe9d1414a4b539b9e4a2 (diff)
Imagine/GroupBox: cleanup internal IDs for deferred execution
Task-number: QTBUG-50992 Change-Id: Ied6b4365d03fc1ef3ae3a69667f1cb1fc8cdb9ac Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
-rw-r--r--src/imports/controls/imagine/GroupBox.qml9
-rw-r--r--tests/auto/sanity/BLACKLIST2
2 files changed, 4 insertions, 7 deletions
diff --git a/src/imports/controls/imagine/GroupBox.qml b/src/imports/controls/imagine/GroupBox.qml
index ac09fb16..0049b8b0 100644
--- a/src/imports/controls/imagine/GroupBox.qml
+++ b/src/imports/controls/imagine/GroupBox.qml
@@ -60,10 +60,10 @@ T.GroupBox {
label: Label {
width: control.width
- topPadding: header.topPadding
- leftPadding: header.leftPadding
- rightPadding: header.rightPadding
- bottomPadding: header.bottomPadding
+ topPadding: background.topPadding
+ leftPadding: background.leftPadding
+ rightPadding: background.rightPadding
+ bottomPadding: background.bottomPadding
text: control.title
font: control.font
@@ -73,7 +73,6 @@ T.GroupBox {
color: control.palette.windowText
background: NinePatchImage {
- id: header
width: parent.width
height: parent.height
diff --git a/tests/auto/sanity/BLACKLIST b/tests/auto/sanity/BLACKLIST
index b2038576..ab9673a7 100644
--- a/tests/auto/sanity/BLACKLIST
+++ b/tests/auto/sanity/BLACKLIST
@@ -6,8 +6,6 @@
*
[ids:imagine/DelayButton.qml]
*
-[ids:imagine/GroupBox.qml]
-*
[ids:imagine/ProgressBar.qml]
*
[ids:imagine/ProgressBar.qml]