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

Conflicts:
	tests/auto/controls/data/tst_button.qml

Change-Id: I5c97b3c1944e52dba44fd3c7d6d9a255c5e08cf7

1 files changed, 19 insertions, 1 deletions

diff --git a/src/quickcontrols2/qquickstyle.cpp b/src/quickcontrols2/qquickstyle.cpp
index f4fc1764..d7143be7 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) { }
@@ -179,7 +197,7 @@ struct QQuickStyleSpec
         if (QGuiApplication::instance()) {
             if (!custom) {
                 const QString targetPath = QStringLiteral("QtQuick/Controls.2");
-                const QStringList importPaths = QQmlEngine().importPathList();
+                const QStringList importPaths = defaultImportPathList();
 
                 for (const QString &importPath : importPaths) {
                     QString stylePath = findStyle(importPath + QLatin1Char('/') + targetPath, style);