From 4a9cd455fae9b2b0e473d3ddf58e664818feb545 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@theqtcompany.com>
Date: Mon, 6 Oct 2014 10:18:29 +0200
Subject: Gallery example: remove the "Layouts" tab
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The content is identical to the Basic Layouts example.

Task-number: QTBUG-41307
Change-Id: I781d741ccfb9cc1443eae7410990d968ff6a209d
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
---
 .../quick/controls/gallery/content/Layouts.qml     | 107 ---------------------
 examples/quick/controls/gallery/main.qml           |   4 -
 examples/quick/controls/gallery/resources.qrc      |   1 -
 3 files changed, 112 deletions(-)
 delete mode 100644 examples/quick/controls/gallery/content/Layouts.qml

diff --git a/examples/quick/controls/gallery/content/Layouts.qml b/examples/quick/controls/gallery/content/Layouts.qml
deleted file mode 100644
index 8d6b096e..00000000
--- a/examples/quick/controls/gallery/content/Layouts.qml
+++ /dev/null
@@ -1,107 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Quick Controls module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.2
-import QtQuick.Controls 1.2
-import QtQuick.Layouts 1.0
-
-Item {
-    id:root
-    anchors.fill: parent
-    anchors.margins: 8
-
-    ColumnLayout {
-        id: mainLayout
-        anchors.fill: parent
-        spacing: 4
-        GroupBox {
-            id: rowBox
-            title: "Row layout"
-            Layout.fillWidth: true
-            RowLayout {
-                id: rowLayout
-                anchors.fill: parent
-                TextField {
-                    placeholderText: "This wants to grow horizontally"
-                    Layout.fillWidth: true
-                }
-                Button {
-                    text: "Button"
-                }
-            }
-        }
-
-        GroupBox {
-            id: gridBox
-            title: "Grid layout"
-            Layout.fillWidth: true
-
-            GridLayout {
-                id: gridLayout
-                anchors.fill: parent
-                rows: 3
-                flow: GridLayout.TopToBottom
-
-                Label { text: "Line 1" }
-                Label { text: "Line 2" }
-                Label { text: "Line 3" }
-
-                TextField { }
-                TextField { }
-                TextField { }
-
-                TextArea {
-                    text: "This widget spans over three rows in the GridLayout.\n"
-                          + "All items in the GridLayout are implicitly positioned from top to bottom."
-                    Layout.rowSpan: 3
-                    Layout.fillHeight: true
-                    Layout.fillWidth: true
-                }
-            }
-        }
-        TextArea {
-            id: t3
-            text: "This fills the whole cell"
-            Layout.minimumHeight: 30
-            Layout.fillHeight: true
-            Layout.fillWidth: true
-        }
-    }
-}
diff --git a/examples/quick/controls/gallery/main.qml b/examples/quick/controls/gallery/main.qml
index 143a8cb1..c8011e13 100644
--- a/examples/quick/controls/gallery/main.qml
+++ b/examples/quick/controls/gallery/main.qml
@@ -195,10 +195,6 @@ ApplicationWindow {
             title: "Styles"
             Styles { anchors.fill: parent }
         }
-        Tab {
-            title: "Layouts"
-            Layouts { anchors.fill:parent }
-        }
     }
 }
 
diff --git a/examples/quick/controls/gallery/resources.qrc b/examples/quick/controls/gallery/resources.qrc
index ca9c6521..f6c53bdf 100644
--- a/examples/quick/controls/gallery/resources.qrc
+++ b/examples/quick/controls/gallery/resources.qrc
@@ -6,7 +6,6 @@
         <file>content/Controls.qml</file>
         <file>content/ImageViewer.qml</file>
         <file>content/ModelView.qml</file>
-        <file>content/Layouts.qml</file>
         <file>content/Styles.qml</file>
         <file>images/document-open.png</file>
         <file>images/document-open@2x.png</file>
-- 
cgit v1.2.1