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, 139 insertions, 0 deletions

diff --git a/examples/quickcontrols/controls/filesystembrowser/main.qml b/examples/quickcontrols/controls/filesystembrowser/main.qml
new file mode 100644
index 000000000..b07b842bc
--- /dev/null
+++ b/examples/quickcontrols/controls/filesystembrowser/main.qml
@@ -0,0 +1,139 @@
+/****************************************************************************
+**
+** 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.Controls 1.5
+import QtQml.Models 2.2
+import io.qt.examples.quick.controls.filesystembrowser 1.0
+
+ApplicationWindow {
+    visible: true
+    width: 640
+    height: 480
+    title: qsTr("File System")
+
+    menuBar: MenuBar {
+        Menu {
+            title: qsTr("File")
+            MenuItem {
+                text: qsTr("Exit")
+                onTriggered: Qt.quit();
+            }
+        }
+    }
+
+    Row {
+        id: row
+        anchors.top: parent.top
+        anchors.topMargin: 12
+        anchors.horizontalCenter: parent.horizontalCenter
+
+        ExclusiveGroup {
+            id: eg
+        }
+
+        Repeater {
+            model: [ "None", "Single", "Extended", "Multi", "Contig."]
+            Button {
+                text: modelData
+                exclusiveGroup: eg
+                checkable: true
+                checked: index === 1
+                onClicked: view.selectionMode = index
+            }
+        }
+    }
+
+    ItemSelectionModel {
+        id: sel
+        model: fileSystemModel
+    }
+
+    TreeView {
+        id: view
+        anchors.fill: parent
+        anchors.margins: 2 * 12 + row.height
+        model: fileSystemModel
+        rootIndex: rootPathIndex
+        selection: sel
+
+        TableViewColumn {
+            title: "Name"
+            role: "fileName"
+            resizable: true
+        }
+
+        TableViewColumn {
+            title: "Size"
+            role: "size"
+            resizable: true
+            horizontalAlignment : Text.AlignRight
+            width: 70
+        }
+
+        TableViewColumn {
+            title: "Permissions"
+            role: "displayableFilePermissions"
+            resizable: true
+            width: 100
+        }
+
+        TableViewColumn {
+            title: "Date Modified"
+            role: "lastModified"
+            resizable: true
+        }
+
+        onActivated : {
+            var url = fileSystemModel.data(index, FileSystemModel.UrlStringRole)
+            Qt.openUrlExternally(url)
+        }
+    }
+}