Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	examples/quickcontrols/extras/flat/main.cpp
	src/controls/Private/qquickcontrolsettings.cpp

Change-Id: I9eb9342a2ee994611f3cb18daab6dd89eb924ccc

1 files changed, 108 insertions, 0 deletions

diff --git a/examples/quickcontrols/controls/uiforms/MainForm.ui.qml b/examples/quickcontrols/controls/uiforms/MainForm.ui.qml
new file mode 100644
index 000000000..499e7abeb
--- /dev/null
+++ b/examples/quickcontrols/controls/uiforms/MainForm.ui.qml
@@ -0,0 +1,108 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, 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 The Qt Company Ltd 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.Dialogs 1.1
+import QtQuick.Controls 1.2
+
+Item {
+    width: 800
+    height: 480
+    property alias tableView: tableView
+
+    SplitView {
+        id: splitView
+        anchors.fill: parent
+
+        TableView {
+            id: tableView
+
+            property int columnWidth: width / 3
+            Layout.minimumWidth: splitView.width / 3
+
+            TableViewColumn {
+                role: "customerId"
+                title: qsTr("Customer Id")
+                width: tableView.columnWidth
+            }
+
+            TableViewColumn {
+                role: "firstName"
+                title: qsTr("First Name")
+                width: tableView.columnWidth
+            }
+            TableViewColumn {
+                role: "lastName"
+                title: qsTr("Last Name")
+                width: tableView.columnWidth
+            }
+        }
+
+        TabView {
+            id: tabView
+
+            Layout.minimumWidth: 480
+
+            Tab {
+                title: qsTr("Customer Settings")
+                source: "qml/Settings.qml"
+            }
+            Tab {
+                title: qsTr("Customer Notes")
+                source: "qml/Notes.qml"
+            }
+            Tab {
+                title: qsTr("Customer History")
+                source: "qml/History.qml"
+            }
+        }
+    }
+}