windeployqt: Detect Quick applications by checking Qt5Quick[d].dll.
authorFriedemann Kleint <Friedemann.Kleint@digia.com>
Thu, 28 Aug 2014 14:11:32 +0000 (16:11 +0200)
committerFriedemann Kleint <Friedemann.Kleint@digia.com>
Mon, 1 Sep 2014 05:20:13 +0000 (07:20 +0200)
Applications no longer have a direct dependency to Qt5Qml[d].dll.

Task-number: QTBUG-40663
Change-Id: I2b3569c3d39f6a96e3f44d6e2541c6697c93bd7f
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
src/windeployqt/main.cpp

index 9833d21..eacb236 100644 (file)
@@ -959,7 +959,7 @@ static DeployResult deploy(const Options &options,
     }
 
     const bool usesQml2 = !(options.disabledLibraries & QtQmlModule)
-                            && ((result.directlyUsedQtLibraries & QtQmlModule)
+                            && ((result.directlyUsedQtLibraries & (QtQmlModule | QtQuickModule))
                                 || (options.additionalLibraries & QtQmlModule));
 
     if (optVerboseLevel) {