From b813a5b1209a7eaa64b34d80c6d8259e6226d445 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Tue, 1 Nov 2022 16:52:57 +0100 Subject: [PATCH] Remove the special handling of the qml directory when parsing xml deps The 'qml-root-path' option is not mandatory to have value when using CMake, even if Qml/Quick is used in the project. This happens when the project doesn't use .qml files. In this case the 'qml' directory from Qt6Quick_-android-dependencies.xml is treated as a normal folder for scanning and androiddeployqt deploys all the QML plugins with their dependencies. It looks like the 'qml' directory was added to bundled file in times when qmlimportscanner was not implemented, so the need of its use is redundant. This removes both adding the 'qml' directory as the bundled dependency and the special case that avoids its scanning. This fix is applicable for both CMake and qmake. Amends 54c959643ea92c0b87a7807c64f2351328cdce7d Task-number: QTBUG-106035 Task-number: QTBUG-107589 Change-Id: Idd55617b8ca8ab1d210cce737548ee486ea94986 Reviewed-by: Alexandru Croitor --- src/tools/androiddeployqt/main.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index 5b85c9485af..1575ea9b240 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -1769,11 +1769,6 @@ bool readAndroidDependencyXml(Options *options, QString file = reader.attributes().value("file"_L1).toString(); - // Special case, since this is handled by qmlimportscanner instead - if (!options->rootPaths.empty() - && (file == "qml"_L1 || file == "qml/"_L1)) - continue; - const QList fileNames = findFilesRecursively(*options, file); for (const QtDependency &fileName : fileNames) { if (usedDependencies->contains(fileName.absolutePath))