GroupBox: migrage from frame to background

Change-Id: Ice0b983a89367c3d4cae1bfbc9500bf98ad90ba8
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>

6 files changed, 12 insertions, 59 deletions

diff --git a/src/imports/controls/GroupBox.qml b/src/imports/controls/GroupBox.qml
index bc1801c2..7ae14c24 100644
--- a/src/imports/controls/GroupBox.qml
+++ b/src/imports/controls/GroupBox.qml
@@ -70,8 +70,8 @@ T.GroupBox {
     }
     //! [label]
 
-    //! [frame]
-    frame: Rectangle {
+    //! [background]
+    background: Rectangle {
         y: control.topPadding - control.padding
         width: parent.width
         height: parent.height - control.topPadding + control.padding
@@ -79,5 +79,5 @@ T.GroupBox {
         color: "transparent"
         border.color: "#bdbebf"
     }
-    //! [frame]
+    //! [background]
 }
diff --git a/src/imports/controls/doc/images/qtlabscontrols-groupbox-frame.png b/src/imports/controls/doc/images/qtlabscontrols-groupbox-frame.png
deleted file mode 100644
index 2ed75011..00000000
--- a/src/imports/controls/doc/images/qtlabscontrols-groupbox-frame.png
+++ /dev/null
diff --git a/src/imports/controls/doc/snippets/qtlabscontrols-groupbox-frame.qml b/src/imports/controls/doc/snippets/qtlabscontrols-groupbox-frame.qml
deleted file mode 100644
index 49ecc00d..00000000
--- a/src/imports/controls/doc/snippets/qtlabscontrols-groupbox-frame.qml
+++ /dev/null
@@ -1,41 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import Qt.labs.controls 1.0
-
-GroupBox {
-    width: 100
-    height: 100
-    title: "GroupBox"
-    Rectangle {
-        parent: frame
-        anchors.fill: parent
-        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 0d9af2c8..c108915c 100644
--- a/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc
+++ b/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc
@@ -180,20 +180,14 @@
 
     \section1 Customizing GroupBox
 
-        GroupBox consists of three visual items: \l {Control::background}{background},
-        \l {Frame::frame}{frame} and \l {GroupBox::label}{label}.
+        GroupBox consists of two visual items: \l {Control::background}{background}
+        and \l {GroupBox::label}{label}.
 
         \section3 Background
 
             \image qtlabscontrols-groupbox-background.png
 
-            GroupBox has no background item by default.
-
-        \section3 Frame
-
-            \image qtlabscontrols-groupbox-frame.png
-
-            \snippet GroupBox.qml frame
+            \snippet GroupBox.qml background
 
         \section3 Label
 
diff --git a/src/imports/controls/material/GroupBox.qml b/src/imports/controls/material/GroupBox.qml
index 3461cb6e..ef54ea7c 100644
--- a/src/imports/controls/material/GroupBox.qml
+++ b/src/imports/controls/material/GroupBox.qml
@@ -71,8 +71,8 @@ T.GroupBox {
     }
     //! [label]
 
-    //! [frame]
-    frame: Rectangle {
+    //! [background]
+    background: Rectangle {
         y: control.topPadding - control.padding
         width: parent.width
         height: parent.height - control.topPadding + control.padding
@@ -81,5 +81,5 @@ T.GroupBox {
         color: "transparent"
         border.color: control.Material.frameColor
     }
-    //! [frame]
+    //! [background]
 }
diff --git a/src/imports/controls/universal/GroupBox.qml b/src/imports/controls/universal/GroupBox.qml
index 9b21a17f..5b25fc75 100644
--- a/src/imports/controls/universal/GroupBox.qml
+++ b/src/imports/controls/universal/GroupBox.qml
@@ -72,8 +72,8 @@ T.GroupBox {
     }
     //! [label]
 
-    //! [frame]
-    frame: Rectangle {
+    //! [background]
+    background: Rectangle {
         y: control.topPadding - control.padding
         width: parent.width
         height: parent.height - control.topPadding + control.padding
@@ -81,5 +81,5 @@ T.GroupBox {
         color: "transparent"
         border.color: control.Universal.chromeDisabledLowColor
     }
-    //! [frame]
+    //! [background]
 }