From 81b5395aef3bce878574fc26e4e75a4498f1c948 Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Thu, 16 Jun 2022 19:26:30 +0200
Subject: [PATCH] CMake: Android: Fix 'qmldir file not found at' warnings

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

Pick-to: 6.4
Fixes: QTBUG-102595
Change-Id: Ia74c3c80f12d05b0a9cd0978df1a58bb5582198a
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
---
 src/corelib/Qt6AndroidMacros.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/corelib/Qt6AndroidMacros.cmake b/src/corelib/Qt6AndroidMacros.cmake
index 139b764ad2f..14c630ed4cc 100644
--- a/src/corelib/Qt6AndroidMacros.cmake
+++ b/src/corelib/Qt6AndroidMacros.cmake
@@ -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}