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

Conflicts:
	src/quickcontrols2/qquickstyle.cpp
	src/quicktemplates2/qquickslider.cpp

Change-Id: Ie12132690680706def6f516334a6ef0ba27336b3

1 files changed, 19 insertions, 1 deletions

diff --git a/src/quickcontrols2/qquickstyle.cpp b/src/quickcontrols2/qquickstyle.cpp
index 4247b204..aa168301 100644
--- a/src/quickcontrols2/qquickstyle.cpp
+++ b/src/quickcontrols2/qquickstyle.cpp
@@ -41,6 +41,7 @@
 #include <QtCore/qdir.h>
 #include <QtCore/qdebug.h>
 #include <QtCore/qsettings.h>
+#include <QtCore/qlibraryinfo.h>
 #include <QtGui/private/qguiapplication_p.h>
 #include <QtQml/private/qqmlmetatype_p.h>
 #include <QtQml/qqmlengine.h>
@@ -96,6 +97,23 @@ QT_BEGIN_NAMESPACE
     \sa {Styling Qt Quick Controls 2}
 */
 
+// TODO: QQmlImportDatabase::defaultImportPathList()
+static QStringList defaultImportPathList()
+{
+    QStringList importPaths;
+    importPaths.reserve(3);
+    importPaths += QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath);
+
+    if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty("QML2_IMPORT_PATH"))) {
+        const QByteArray envImportPath = qgetenv("QML2_IMPORT_PATH");
+        importPaths += QString::fromLatin1(envImportPath).split(QDir::listSeparator(), QString::SkipEmptyParts);
+    }
+
+    importPaths += QStringLiteral("qrc:/qt-project.org/imports");
+    importPaths += QCoreApplication::applicationDirPath();
+    return importPaths;
+}
+
 struct QQuickStyleSpec
 {
     QQuickStyleSpec() : custom(false), resolved(false) { }
@@ -222,7 +240,7 @@ QStringList QQuickStylePrivate::stylePaths()
 
     // built-in import paths
     const QString targetPath = QStringLiteral("QtQuick/Controls.2");
-    const QStringList importPaths = QQmlEngine().importPathList();
+    const QStringList importPaths = defaultImportPathList();
     for (const QString &importPath : importPaths) {
         QDir dir(importPath);
         if (dir.cd(targetPath))