From 4642a6706ddacf4c3413956f3969dd0ccfdac86d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Keller?= Date: Mon, 12 Dec 2022 16:35:10 +0100 Subject: [PATCH] Windeployqt: change qml import handling Made it so that qml dependencies will be imported for all invoked binaries, rather than just the first one. Task-number: QTBUG-99125 Change-Id: I0d97905c59281a03ef2126ae1c436f1034e1575d Reviewed-by: Oliver Wolff (cherry picked from commit 2a732020ff58b6a779e0b374af5f8cd0f6e22459) Reviewed-by: Qt Cherry-pick Bot --- src/tools/windeployqt/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/windeployqt/main.cpp b/src/tools/windeployqt/main.cpp index 15bf2ca2ce1..a8ab3790ead 100644 --- a/src/tools/windeployqt/main.cpp +++ b/src/tools/windeployqt/main.cpp @@ -1358,7 +1358,7 @@ static DeployResult deploy(const Options &options, const QMap // Determine application type, check Quick2 is used by looking at the // direct dependencies (do not be fooled by QtWebKit depending on it). QString qtLibInfix; - for (int m = 0; m < directDependencyCount; ++m) { + for (int m = 0; m < dependentQtLibs.size(); ++m) { const quint64 module = qtModule(dependentQtLibs.at(m), infix); result.directlyUsedQtLibraries[module] = 1; if (module == QtCoreModule)