GroupBox/Frame/ToolBar: use positioners as content item

Change-Id: I8f883dd0fd06172032dd78ff60437c906c2fe8dd
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>

3 files changed, 6 insertions, 24 deletions

diff --git a/tests/auto/controls/data/tst_frame.qml b/tests/auto/controls/data/tst_frame.qml
index 43e0c298..5eb600de 100644
--- a/tests/auto/controls/data/tst_frame.qml
+++ b/tests/auto/controls/data/tst_frame.qml
@@ -82,15 +82,11 @@ TestCase {
     function test_defaults() {
         var control = frame.createObject(testCase)
         verify(control.contentItem)
-        compare(control.contentWidth, 0)
-        compare(control.contentHeight, 0)
         control.destroy()
     }
 
     function test_oneChild() {
         var control = oneChildFrame.createObject(testCase)
-        compare(control.contentWidth, 100)
-        compare(control.contentHeight, 30)
         verify(control.implicitWidth > 100)
         verify(control.implicitHeight > 30)
         control.destroy()
@@ -98,10 +94,8 @@ TestCase {
 
     function test_twoChildren() {
         var control = twoChildrenFrame.createObject(testCase)
-        compare(control.contentWidth, 0)
-        compare(control.contentHeight, 0)
-        verify(control.implicitWidth > 0)
-        verify(control.implicitHeight > 0)
+        verify(control.implicitWidth > 200)
+        verify(control.implicitHeight > 60)
         control.destroy()
     }
 }
diff --git a/tests/auto/controls/data/tst_groupbox.qml b/tests/auto/controls/data/tst_groupbox.qml
index 65aa4e16..760450f0 100644
--- a/tests/auto/controls/data/tst_groupbox.qml
+++ b/tests/auto/controls/data/tst_groupbox.qml
@@ -83,15 +83,11 @@ TestCase {
         var control = groupBox.createObject(testCase)
         verify(control.contentItem)
         compare(control.title, "")
-        compare(control.contentWidth, 0)
-        compare(control.contentHeight, 0)
         control.destroy()
     }
 
     function test_oneChild() {
         var control = oneChildBox.createObject(testCase)
-        compare(control.contentWidth, 100)
-        compare(control.contentHeight, 30)
         verify(control.implicitWidth > 100)
         verify(control.implicitHeight > 30)
         control.destroy()
@@ -99,10 +95,8 @@ TestCase {
 
     function test_twoChildren() {
         var control = twoChildrenBox.createObject(testCase)
-        compare(control.contentWidth, 0)
-        compare(control.contentHeight, 0)
-        verify(control.implicitWidth > 0)
-        verify(control.implicitHeight > 0)
+        verify(control.implicitWidth > 200)
+        verify(control.implicitHeight > 60)
         control.destroy()
     }
 }
diff --git a/tests/auto/controls/data/tst_toolbar.qml b/tests/auto/controls/data/tst_toolbar.qml
index 6b343894..694e6e24 100644
--- a/tests/auto/controls/data/tst_toolbar.qml
+++ b/tests/auto/controls/data/tst_toolbar.qml
@@ -82,15 +82,11 @@ TestCase {
     function test_defaults() {
         var control = toolBar.createObject(testCase)
         verify(control.contentItem)
-        compare(control.contentWidth, 0)
-        compare(control.contentHeight, 0)
         control.destroy()
     }
 
     function test_oneChild() {
         var control = oneChildBar.createObject(testCase)
-        compare(control.contentWidth, 100)
-        compare(control.contentHeight, 30)
         verify(control.implicitWidth > 100)
         verify(control.implicitHeight > 30)
         control.destroy()
@@ -98,10 +94,8 @@ TestCase {
 
     function test_twoChildren() {
         var control = twoChildrenBar.createObject(testCase)
-        compare(control.contentWidth, 0)
-        compare(control.contentHeight, 0)
-        verify(control.implicitWidth > 0)
-        verify(control.implicitHeight > 0)
+        verify(control.implicitWidth > 200)
+        verify(control.implicitHeight > 60)
         control.destroy()
     }
 }