Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
	.qmake.conf
	tests/auto/controls/data/tst_stackview.qml

Change-Id: I54b55d51452e812315f97bcdfd1a8e361a427f56

1 files changed, 114 insertions, 0 deletions

diff --git a/examples/quick/controls/gallery/qml/InputPage.qml b/examples/quick/controls/gallery/qml/InputPage.qml
new file mode 100644
index 00000000..cb1878d0
--- /dev/null
+++ b/examples/quick/controls/gallery/qml/InputPage.qml
@@ -0,0 +1,114 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 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.Layouts 1.1
+import QtQuick.Controls 1.2
+
+ScrollView {
+    id: page
+
+    horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff
+
+    Item {
+        id: content
+
+        width: Math.max(page.viewport.width, column.implicitWidth + 2 * column.spacing)
+        height: Math.max(page.viewport.height, column.implicitHeight + 2 * column.spacing)
+
+        ColumnLayout {
+            id: column
+
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.margins: column.spacing
+
+            GroupBox {
+                title: "TextField"
+                Layout.fillWidth: true
+                ColumnLayout {
+                    anchors.fill: parent
+                    TextField { placeholderText: "..."; Layout.fillWidth: true; z: 1 }
+                    TextField { placeholderText: "Password"; echoMode: TextInput.Password; Layout.fillWidth: true }
+                }
+            }
+
+            GroupBox {
+                title: "ComboBox"
+                Layout.fillWidth: true
+                ColumnLayout {
+                    anchors.fill: parent
+                    ComboBox {
+                        model: Qt.fontFamilies()
+                        Layout.fillWidth: true
+                    }
+                    ComboBox {
+                        editable: true
+                        model: ListModel {
+                            id: listModel
+                            ListElement { text: "Apple" }
+                            ListElement { text: "Banana" }
+                            ListElement { text: "Coconut" }
+                            ListElement { text: "Orange" }
+                        }
+                        onAccepted: {
+                            if (find(currentText) === -1) {
+                                listModel.append({text: editText})
+                                currentIndex = find(editText)
+                            }
+                        }
+                        Layout.fillWidth: true
+                    }
+                }
+            }
+
+            GroupBox {
+                title: "SpinBox"
+                Layout.fillWidth: true
+                ColumnLayout {
+                    anchors.fill: parent
+                    SpinBox { value: 99; Layout.fillWidth: true; z: 1 }
+                    SpinBox { decimals: 2; Layout.fillWidth: true }
+                }
+            }
+        }
+    }
+}