1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Android: Fix 'qmldir file not found at' warnings

Browse Source 
androiddepployqt calls qmlimportscanner to find qml modules.

Due to an issue in a generator expression, CMake did not write out the
android default qml output directory to the deployment json file,
which in turn means that qmlimportscanner did not get that
information.
When the scanner scanned the sources, it found some relative imports
but couldn't find relevant qmldir files because they were in an
android-specific directory.

This caused warnings like 'qmldir file not found at /some/path'
repeatedly.

Fix the generator expression to use $<COMMA> instead of , so that the
genex condition is evaluated successfully and the extra qml import
paths are passed along to qmlimportscanner.

Amends 76665f2a72857916667ebe6b04a804ed8abb5853

Fixes: QTBUG-102595
Change-Id: Ia74c3c80f12d05b0a9cd0978df1a58bb5582198a
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 81b5395aef3bce878574fc26e4e75a4498f1c948)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alexandru Croitor 2022-06-16 19:26:30 +02:00 committed by Qt Cherry-pick Bot
parent c9a79666ac
commit 8562f3aee6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/Qt6AndroidMacros.cmake
View File

@ -733,7 +733,7 @@ function(_qt_internal_add_android_deployment_list_property out_var json_key)
"${add_comma_genex}${add_quote_genex}"
"$<JOIN:"
"${property_genex},"
"\",\""
"\"$<COMMA>\""
">"
"${add_quote_genex}"
)
@ -756,7 +756,7 @@ function(_qt_internal_add_android_deployment_multi_value_property out_var json_k
string(JOIN "" list_join_genex
"$<JOIN:"
"${property_genex},"
","
"$<COMMA>"
">"
)
string(APPEND ${out_var}