Update GroupBox to support contentItem

- Removed contentWidth and contentHeight since it is not needed
- Exposed contentItem so that it can be designable.
- Respect the implicit width or height of the contentItem if it is the
only item of the GroupBox. Otherwise childrenRect is used.
- Modified the style so that the style takes care of only the
padding size and not the entire size of the group box.
- Fixed flat and checkable appearance for custom style

Change-Id: I2c7ec4cb7d5e6f96863847e8d8d6d6f52428364e
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>

1 files changed, 28 insertions, 0 deletions

diff --git a/tests/auto/controls/data/tst_groupbox.qml b/tests/auto/controls/data/tst_groupbox.qml
index 5599ca5f..6753868c 100644
--- a/tests/auto/controls/data/tst_groupbox.qml
+++ b/tests/auto/controls/data/tst_groupbox.qml
@@ -84,6 +84,34 @@ TestCase {
             groupBox.destroy()
     }
 
+    function test_contentItem() {
+        verify (groupBox.contentItem !== null)
+        verify (groupBox.contentItem.anchors !== undefined)
+    }
+
+    function test_dynamicSize() {
+
+        var groupbox = Qt.createQmlObject('import QtQuick.Controls 1.0; import QtQuick.Controls.Styles.Private 1.0 ; GroupBox {style:GroupBoxStyle{}}', container, '')
+        compare(groupbox.width, 16)
+        compare(groupbox.height, 16)
+
+        var content = Qt.createQmlObject('import QtQuick 2.1; Rectangle {implicitWidth:100 ; implicitHeight:30}', container, '')
+        content.parent = groupbox.contentItem
+        compare(groupbox.implicitWidth, 116)
+        compare(groupbox.implicitHeight, 46)
+        content.parent = null
+        content.destroy()
+
+        content = Qt.createQmlObject('import QtQuick 2.1; Rectangle {width:20 ; height:20}', container, '')
+        content.parent = groupbox.contentItem
+        compare(groupbox.implicitWidth, 36)
+        compare(groupbox.implicitHeight, 36)
+        content.parent = null
+        content.destroy()
+
+        groupbox.destroy()
+    }
+
     function test_checkable() {
         compare(groupBox.checkable, false)
         compare(groupBox.child1.enabled, true)