qmlimportscanner: don't include QtQuick.Controls.xxx.impl as depdendency

Since Qt 5 series include those modules QtQuick.Controls.xxx.Impl inside
QtQuick.Controls.xxx, we shouldn't add them to the dependencies list.
This also will silence androiddeployqt warning about invalid path
for these modules.

Pick-to: 5.15
Change-Id: Ic8c8aa1248b170ab1d455484effb38d24a1b4d35
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

1 files changed, 4 insertions, 0 deletions

diff --git a/tools/qmlimportscanner/main.cpp b/tools/qmlimportscanner/main.cpp
index e0c98154d7..91c37a620f 100644
--- a/tools/qmlimportscanner/main.cpp
+++ b/tools/qmlimportscanner/main.cpp
@@ -121,6 +121,10 @@ QVariantList findImportsInAst(QQmlJS::AST::UiHeaderItemList *headerItemList, con
                 uri = uri->next;
             }
             name.chop(1); // remove trailing "."
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+            if (name.startsWith(QLatin1String("QtQuick.Controls")) && name.endsWith(QLatin1String("impl")))
+                continue;
+#endif
             if (!name.isEmpty())
                 import[nameLiteral()] = name;
             import[typeLiteral()] = moduleLiteral();