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

Conflicts:
	src/imports/controls/SpinBox.qml
	src/imports/controls/material/SpinBox.qml
	src/imports/controls/universal/SpinBox.qml
	tests/auto/controls/data/tst_swipedelegate.qml

Change-Id: Ie1d1f487890f0a9f80a00df5e813e1d2e8303fe5

1 files changed, 29 insertions, 0 deletions

diff --git a/src/quickcontrols2/qquickstyle.cpp b/src/quickcontrols2/qquickstyle.cpp
index aa168301..cf4979c1 100644
--- a/src/quickcontrols2/qquickstyle.cpp
+++ b/src/quickcontrols2/qquickstyle.cpp
@@ -183,6 +183,15 @@ struct QQuickStyleSpec
                     setFallbackStyle(settings->value(QStringLiteral("FallbackStyle")).toString(), ":/qtquickcontrols2.conf");
             }
         }
+
+        // resolve a path relative to the config
+        QString configPath = QFileInfo(resolveConfigFilePath()).path();
+        QString stylePath = findStyle(configPath, style);
+        if (!stylePath.isEmpty()) {
+            style = stylePath;
+            resolved = true;
+        }
+
         custom = style.contains(QLatin1Char('/'));
 
         if (baseUrl.isValid()) {
@@ -220,11 +229,26 @@ struct QQuickStyleSpec
         fallbackMethod.clear();
     }
 
+    QString resolveConfigFilePath()
+    {
+        if (configFilePath.isEmpty()) {
+            configFilePath = QFile::decodeName(qgetenv("QT_QUICK_CONTROLS_CONF"));
+            if (!QFile::exists(configFilePath)) {
+                if (!configFilePath.isEmpty())
+                    qWarning("QT_QUICK_CONTROLS_CONF=%s: No such file", qPrintable(configFilePath));
+
+                configFilePath = QStringLiteral(":/qtquickcontrols2.conf");
+            }
+        }
+        return configFilePath;
+    }
+
     bool custom;
     bool resolved;
     QString style;
     QString fallbackStyle;
     QByteArray fallbackMethod;
+    QString configFilePath;
 };
 
 Q_GLOBAL_STATIC(QQuickStyleSpec, styleSpec)
@@ -282,6 +306,11 @@ void QQuickStylePrivate::reset()
     styleSpec()->reset();
 }
 
+QString QQuickStylePrivate::configFilePath()
+{
+    return styleSpec()->resolveConfigFilePath();
+}
+
 /*!
     Returns the name of the application style.