summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2014-08-28 16:11:32 +0200
committerFriedemann Kleint <Friedemann.Kleint@digia.com>2014-09-01 07:20:13 +0200
commitea7dd054c8afb0e1cede0eafb0ee3b0042a87a15 (patch)
tree3be99362658804fdf711f5062786c92226b463bd
parent9a5b1d7fbb39cb340536eb41596404c3e0fe2ccf (diff)
windeployqt: Detect Quick applications by checking Qt5Quick[d].dll.
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>
-rw-r--r--src/windeployqt/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp
index 9833d2125..eacb236ad 100644
--- a/src/windeployqt/main.cpp
+++ b/src/windeployqt/main.cpp
@@ -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) {