From 9db0ede4c953c92eb0547c2acb04d6e87ba60ac1 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Wed, 16 Sep 2020 15:08:11 +0300 Subject: 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. Change-Id: Ic8c8aa1248b170ab1d455484effb38d24a1b4d35 Reviewed-by: Ulf Hermann (cherry picked from commit 8ca9191580e218e5359c6703a42ae9595e4aca1f) Reviewed-by: Qt Cherry-pick Bot --- tools/qmlimportscanner/main.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/qmlimportscanner/main.cpp b/tools/qmlimportscanner/main.cpp index aca11e2ca4..5e3f41e8c6 100644 --- a/tools/qmlimportscanner/main.cpp +++ b/tools/qmlimportscanner/main.cpp @@ -120,6 +120,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(); -- cgit v1.2.3