Merge remote-tracking branch 'origin/4.4'

Change-Id: I53a31b3463b2bd8efffb1c00e5d172854d8ff5e5
2017-09-08 13:06:07 +02:00
parent 79e94ddae8 315cede70f
commit a9aac73e37
17 changed files with 102 additions and 31 deletions
--- a/src/plugins/android/androiddebugsupport.cpp
+++ b/src/plugins/android/androiddebugsupport.cpp
@@ -55,7 +55,7 @@ namespace Internal {
 static const char * const qMakeVariables[] = {
         "QT_INSTALL_LIBS",
         "QT_INSTALL_PLUGINS",
-         "QT_INSTALL_IMPORTS"
+         "QT_INSTALL_QML"
 };

 static QStringList qtSoPaths(QtSupport::BaseQtVersion *qtVersion)