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

Conflicts:
	examples/quickcontrols2/gallery/gallery.qrc
	src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc
	src/quicktemplates2/qquickstackview_p.cpp
	src/quicktemplates2/qquickstackview_p_p.h
	tests/auto/controls/data/tst_stackview.qml

Change-Id: If451fe0e5653572d305b4de90a6d5cb878463e8d

1 files changed, 13 insertions, 1 deletions

diff --git a/src/quickcontrols2/qquickstyleattached.cpp b/src/quickcontrols2/qquickstyleattached.cpp
index 6683b018..7c9935ea 100644
--- a/src/quickcontrols2/qquickstyleattached.cpp
+++ b/src/quickcontrols2/qquickstyleattached.cpp
@@ -167,6 +167,18 @@ static QList<QQuickStyleAttached *> findChildStyles(const QMetaObject *type, QOb
     return children;
 }
 
+static QString resolveConfigFile()
+{
+    QString filePath = QFile::decodeName(qgetenv("QT_QUICK_CONTROLS_CONF"));
+    if (!QFile::exists(filePath)) {
+        if (!filePath.isEmpty())
+            qWarning("QT_QUICK_CONTROLS_CONF=%s: No such file", qPrintable(filePath));
+
+        filePath = QStringLiteral(":/qtquickcontrols2.conf");
+    }
+    return filePath;
+}
+
 QQuickStyleAttached::QQuickStyleAttached(QObject *parent) : QObject(parent)
 {
     QQuickItem *item = qobject_cast<QQuickItem *>(parent);
@@ -196,7 +208,7 @@ QQuickStyleAttached::~QQuickStyleAttached()
 QSharedPointer<QSettings> QQuickStyleAttached::settings(const QString &group)
 {
 #ifndef QT_NO_SETTINGS
-    const QString filePath = QStringLiteral(":/qtquickcontrols2.conf");
+    static const QString filePath = resolveConfigFile();
     if (QFile::exists(filePath)) {
         QFileSelector selector;
         QSettings *settings = new QSettings(selector.select(filePath), QSettings::IniFormat);