Merge 5.4 into 5.4.1v5.4.1

Change-Id: Id1f12a225d975ba3a2c244e90c00126b9e90368a

1 files changed, 5 insertions, 1 deletions

diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp
index a1568fa5b..1b46957dc 100644
--- a/src/windeployqt/main.cpp
+++ b/src/windeployqt/main.cpp
@@ -712,8 +712,12 @@ static inline quint64 qtModuleForPlugin(const QString &subDirName)
         return QtMultimediaModule;
     if (subDirName == QLatin1String("printsupport"))
         return QtPrintSupportModule;
+    if (subDirName == QLatin1String("scenegraph"))
+        return QtQuickModule;
     if (subDirName == QLatin1String("qmltooling"))
-        return QtDeclarativeModule | QtQuickModule | QtQmlToolingModule;
+        return QtQuickModule | QtQmlToolingModule;
+    if (subDirName == QLatin1String("qml1tooling"))
+        return QtDeclarativeModule;
     if (subDirName == QLatin1String("position"))
         return QtPositioningModule;
     if (subDirName == QLatin1String("sensors") || subDirName == QLatin1String("sensorgestures"))