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

4 files changed, 316 insertions, 0 deletions

diff --git a/examples/quickcontrols/controls/filesystembrowser/filesystembrowser.pro b/examples/quickcontrols/controls/filesystembrowser/filesystembrowser.pro
new file mode 100644
index 00000000..fc14584c
--- /dev/null
+++ b/examples/quickcontrols/controls/filesystembrowser/filesystembrowser.pro
@@ -0,0 +1,10 @@
+TEMPLATE = app
+TARGET = filesystembrowser
+QT += qml quick widgets
+
+SOURCES += main.cpp
+
+RESOURCES += qml.qrc
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/controls/filesystembrowser
+INSTALLS += target
diff --git a/examples/quickcontrols/controls/filesystembrowser/main.cpp b/examples/quickcontrols/controls/filesystembrowser/main.cpp
new file mode 100644
index 00000000..6027c828
--- /dev/null
+++ b/examples/quickcontrols/controls/filesystembrowser/main.cpp
@@ -0,0 +1,162 @@
+/****************************************************************************
+**
+** 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$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include <QQmlApplicationEngine>
+#include <QtQml>
+#include <QFileSystemModel>
+#include <QDateTime>
+#include <QDesktopServices>
+#include <QUrl>
+
+static inline QString permissionString(const QFileInfo &fi)
+{
+    const QFile::Permissions permissions = fi.permissions();
+    QString result = QLatin1String("----------");
+    if (fi.isSymLink())
+        result[0] = QLatin1Char('l');
+    else if (fi.isDir())
+        result[0] = QLatin1Char('d');
+    if (permissions & QFileDevice::ReadUser)
+        result[1] = QLatin1Char('r');
+    if (permissions & QFileDevice::WriteUser)
+        result[2] = QLatin1Char('w');
+    if (permissions & QFileDevice::ExeUser)
+        result[3] = QLatin1Char('x');
+    if (permissions & QFileDevice::ReadGroup)
+        result[4] = QLatin1Char('r');
+    if (permissions & QFileDevice::WriteGroup)
+        result[5] = QLatin1Char('w');
+    if (permissions & QFileDevice::ExeGroup)
+        result[6] = QLatin1Char('x');
+    if (permissions & QFileDevice::ReadOther)
+        result[7] = QLatin1Char('r');
+    if (permissions & QFileDevice::WriteOther)
+        result[8] = QLatin1Char('w');
+    if (permissions & QFileDevice::ExeOther)
+        result[9] = QLatin1Char('x');
+    return result;
+}
+
+static inline QString sizeString(const QFileInfo &fi)
+{
+    if (!fi.isFile())
+        return QString();
+    const qint64 size = fi.size();
+    if (size > 1024 * 1024 * 10)
+        return QString::number(size / (1024 * 1024)) + QLatin1Char('M');
+    if (size > 1024 * 10)
+        return QString::number(size / 1024) + QLatin1Char('K');
+    return QString::number(size);
+}
+
+class DisplayFileSystemModel : public QFileSystemModel {
+    Q_OBJECT
+public:
+    explicit DisplayFileSystemModel(QObject *parent = Q_NULLPTR)
+        : QFileSystemModel(parent) {}
+
+    enum Roles  {
+        SizeRole = Qt::UserRole + 4,
+        DisplayableFilePermissionsRole = Qt::UserRole + 5,
+        LastModifiedRole = Qt::UserRole + 6,
+        UrlStringRole = Qt::UserRole + 7
+    };
+    Q_ENUM(Roles)
+
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE
+    {
+        if (index.isValid() && role >= SizeRole) {
+            switch (role) {
+            case SizeRole:
+                return QVariant(sizeString(fileInfo(index)));
+            case DisplayableFilePermissionsRole:
+                return QVariant(permissionString(fileInfo(index)));
+            case LastModifiedRole:
+                return QVariant(fileInfo(index).lastModified().toString(Qt::SystemLocaleShortDate));
+            case UrlStringRole:
+                return QVariant(QUrl::fromLocalFile(filePath(index)).toString());
+            default:
+                break;
+            }
+        }
+        return QFileSystemModel::data(index, role);
+    }
+
+    QHash<int,QByteArray> roleNames() const Q_DECL_OVERRIDE
+    {
+         QHash<int, QByteArray> result = QFileSystemModel::roleNames();
+         result.insert(SizeRole, QByteArrayLiteral("size"));
+         result.insert(DisplayableFilePermissionsRole, QByteArrayLiteral("displayableFilePermissions"));
+         result.insert(LastModifiedRole, QByteArrayLiteral("lastModified"));
+         return result;
+    }
+};
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    QQmlApplicationEngine engine;
+    qmlRegisterUncreatableType<DisplayFileSystemModel>("io.qt.examples.quick.controls.filesystembrowser", 1, 0,
+                                                       "FileSystemModel", "Cannot create a FileSystemModel instance.");
+    QFileSystemModel *fsm = new DisplayFileSystemModel(&engine);
+    fsm->setRootPath(QDir::homePath());
+    fsm->setResolveSymlinks(true);
+    engine.rootContext()->setContextProperty("fileSystemModel", fsm);
+    engine.rootContext()->setContextProperty("rootPathIndex", fsm->index(fsm->rootPath()));
+    engine.load(QUrl(QStringLiteral("qrc:///main.qml")));
+    if (engine.rootObjects().isEmpty())
+        return -1;
+
+    return app.exec();
+}
+
+#include "main.moc"
diff --git a/examples/quickcontrols/controls/filesystembrowser/main.qml b/examples/quickcontrols/controls/filesystembrowser/main.qml
new file mode 100644
index 00000000..b07b842b
--- /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)
+        }
+    }
+}
diff --git a/examples/quickcontrols/controls/filesystembrowser/qml.qrc b/examples/quickcontrols/controls/filesystembrowser/qml.qrc
new file mode 100644
index 00000000..5f6483ac
--- /dev/null
+++ b/examples/quickcontrols/controls/filesystembrowser/qml.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/">
+        <file>main.qml</file>
+    </qresource>
+</RCC>