diff options
author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-09-16 15:08:11 +0300 |
---|---|---|
committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-09-17 07:58:02 +0000 |
commit | 8ca9191580e218e5359c6703a42ae9595e4aca1f (patch) | |
tree | ad423c8244b76de051e09ece3e64836c06b8c8a9 | |
parent | cdf1f7fc4199e1d875b2f5b8927ecd8d0bbc8589 (diff) |
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>
-rw-r--r-- | tools/qmlimportscanner/main.cpp | 4 |
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(); |