From 48141fbf05ebad046f33225f255cfd6db914daa1 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@theqtcompany.com>
Date: Fri, 5 Feb 2016 10:44:50 +0100
Subject: Frame: migrage from frame to background

Change-Id: I4478580026d4dba8994d09e8d0264b44150631d5
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
---
 src/imports/controls/Frame.qml                     |   9 ++---
 .../doc/images/qtlabscontrols-frame-frame.png      | Bin 341 -> 0 bytes
 .../doc/snippets/qtlabscontrols-frame-frame.qml    |  40 ---------------------
 .../controls/doc/src/qtlabscontrols-customize.qdoc |  11 ++----
 src/imports/controls/material/Frame.qml            |   9 ++---
 src/imports/controls/universal/Frame.qml           |   9 ++---
 6 files changed, 11 insertions(+), 67 deletions(-)
 delete mode 100644 src/imports/controls/doc/images/qtlabscontrols-frame-frame.png
 delete mode 100644 src/imports/controls/doc/snippets/qtlabscontrols-frame-frame.qml

diff --git a/src/imports/controls/Frame.qml b/src/imports/controls/Frame.qml
index 3c9326e1..1f1bfac6 100644
--- a/src/imports/controls/Frame.qml
+++ b/src/imports/controls/Frame.qml
@@ -52,13 +52,10 @@ T.Frame {
     contentItem: Item { }
     //! [contentItem]
 
-    //! [frame]
-    frame: Rectangle {
-        width: parent.width
-        height: parent.height
-
+    //! [background]
+    background: Rectangle {
         color: "transparent"
         border.color: "#bdbebf"
     }
-    //! [frame]
+    //! [background]
 }
diff --git a/src/imports/controls/doc/images/qtlabscontrols-frame-frame.png b/src/imports/controls/doc/images/qtlabscontrols-frame-frame.png
deleted file mode 100644
index a379d915..00000000
Binary files a/src/imports/controls/doc/images/qtlabscontrols-frame-frame.png and /dev/null differ
diff --git a/src/imports/controls/doc/snippets/qtlabscontrols-frame-frame.qml b/src/imports/controls/doc/snippets/qtlabscontrols-frame-frame.qml
deleted file mode 100644
index e4c9e32b..00000000
--- a/src/imports/controls/doc/snippets/qtlabscontrols-frame-frame.qml
+++ /dev/null
@@ -1,40 +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
-
-Frame {
-    width: 100
-    height: 100
-    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 c108915c..e2377424 100644
--- a/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc
+++ b/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc
@@ -162,20 +162,13 @@
 
     \section1 Customizing Frame
 
-        Frame consists of two visual items: \l {Control::background}{background}
-        and \l {Frame::frame}{frame}.
+        Frame consists of one visual item: \l {Control::background}{background}.
 
         \section3 Background
 
             \image qtlabscontrols-frame-background.png
 
-            Frame has no background item by default.
-
-        \section3 Frame
-
-            \image qtlabscontrols-frame-frame.png
-
-            \snippet Frame.qml frame
+            \snippet Frame.qml background
 
 
     \section1 Customizing GroupBox
diff --git a/src/imports/controls/material/Frame.qml b/src/imports/controls/material/Frame.qml
index 9336850d..4c21e40b 100644
--- a/src/imports/controls/material/Frame.qml
+++ b/src/imports/controls/material/Frame.qml
@@ -53,14 +53,11 @@ T.Frame {
     contentItem: Item { }
     //! [contentItem]
 
-    //! [frame]
-    frame: Rectangle {
-        width: parent.width
-        height: parent.height
-
+    //! [background]
+    background: Rectangle {
         radius: 3
         color: "transparent"
         border.color: control.Material.frameColor
     }
-    //! [frame]
+    //! [background]
 }
diff --git a/src/imports/controls/universal/Frame.qml b/src/imports/controls/universal/Frame.qml
index 9427dc2f..70f1647d 100644
--- a/src/imports/controls/universal/Frame.qml
+++ b/src/imports/controls/universal/Frame.qml
@@ -53,13 +53,10 @@ T.Frame {
     contentItem: Item { }
     //! [contentItem]
 
-    //! [frame]
-    frame: Rectangle {
-        width: parent.width
-        height: parent.height
-
+    //! [background]
+    background: Rectangle {
         color: "transparent"
         border.color: control.Universal.chromeDisabledLowColor
     }
-    //! [frame]
+    //! [background]
 }
-- 
cgit v1.2.3