From a2809d9ec1c4351bc356e05e8f3c1db0363bef86 Mon Sep 17 00:00:00 2001
From: Alexey Edelev <alexey.edelev@qt.io>
Date: Thu, 18 Aug 2022 18:34:47 +0200
Subject: [PATCH] Fix Multi-ABI builds when CMAKE_<C/CXX>_COMPILER_LAUNCHER
 contains list

Add list-escaping for CMAKE_<C/CXX>_COMPILER_LAUNCHER variables when
passing them to an external ABI-specific Android project.

Amends c7231177df71879b6d3ebc48288a6d3d8fdab6d0

Pick-to: 6.3 6.4
Change-Id: I0c98eee6594c395dc6a37465a99ea32b1af39b84
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 src/corelib/Qt6AndroidMacros.cmake | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/corelib/Qt6AndroidMacros.cmake b/src/corelib/Qt6AndroidMacros.cmake
index 2cc5d3e8e6..99ecbd3914 100644
--- a/src/corelib/Qt6AndroidMacros.cmake
+++ b/src/corelib/Qt6AndroidMacros.cmake
@@ -974,11 +974,17 @@ function(_qt_internal_configure_android_multiabi_target target)
     endif()
 
     if(CMAKE_C_COMPILER_LAUNCHER)
-        list(APPEND extra_cmake_args "-DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER}")
+        list(JOIN CMAKE_C_COMPILER_LAUNCHER "$<SEMICOLON>"
+            compiler_launcher)
+        list(APPEND extra_cmake_args
+            "-DCMAKE_C_COMPILER_LAUNCHER=${compiler_launcher}")
     endif()
 
     if(CMAKE_CXX_COMPILER_LAUNCHER)
-        list(APPEND extra_cmake_args "-DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}")
+        list(JOIN CMAKE_CXX_COMPILER_LAUNCHER "$<SEMICOLON>"
+            compiler_launcher)
+        list(APPEND extra_cmake_args
+            "-DCMAKE_CXX_COMPILER_LAUNCHER=${compiler_launcher}")
     endif()
 
     set(missing_qt_abi_toolchains "")