From 4eedc4b2d08ceda346f318745abfaa7705efa55b Mon Sep 17 00:00:00 2001
From: Alexey Edelev <alexey.edelev@qt.io>
Date: Tue, 28 Nov 2023 10:43:22 +0100
Subject: [PATCH] Default the QT_USE_TARGET_ANDROID_BUILD_DIR value to TRUE

Set QT_USE_TARGET_ANDROID_BUILD_DIR to TRUE if Qt version
greater equal 6.8.0.

Change-Id: I051b7c1762858aac798eac167c491ccc68b65cf1
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
---
 src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
index a9634eccf0e..374e353ea76 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
@@ -1480,8 +1480,12 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Id id)
 
             if (qt && qt->qtVersion() >= QVersionNumber(6, 0, 0)) {
                 // Don't build apk under ALL target because Qt Creator will handle it
-                if (qt->qtVersion() >= QVersionNumber(6, 1, 0))
+                if (qt->qtVersion() >= QVersionNumber(6, 1, 0)) {
                     cmd.addArg("-DQT_NO_GLOBAL_APK_TARGET_PART_OF_ALL:BOOL=ON");
+                    if (qt->qtVersion() >= QVersionNumber(6, 8, 0))
+                        cmd.addArg("-DQT_USE_TARGET_ANDROID_BUILD_DIR:BOOL=ON");
+                }
+
                 cmd.addArg("-DQT_HOST_PATH:PATH=%{Qt:QT_HOST_PREFIX}");
                 cmd.addArg("-DANDROID_SDK_ROOT:PATH=" + sdkLocation.path());
             } else {