From 00a96237fd8b40c42744d41c6d545a140c816dee Mon Sep 17 00:00:00 2001
From: Cristian Le <cristian.le@qt.io>
Date: Mon, 12 May 2025 17:00:23 +0200
Subject: [PATCH] Propagate _Qt6CTestMacros in RunCMake

Propagate the `_Qt6CTestMacros` variable so that
`_qt_internal_get_cmake_test_configure_options` can be used
inside the RunCMake tests

Pick-to: 6.8 6.9 6.10
Change-Id: I2b7f3996315169d840bab3dff011927288c9782d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 .../cmake/QtRunCMakeTestHelpers.cmake         |  4 ++++
 .../0004-Propagate-_Qt6CTestMacros.patch      | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 src/testinternal/3rdparty/cmake/patches/0004-Propagate-_Qt6CTestMacros.patch

diff --git a/src/testinternal/3rdparty/cmake/QtRunCMakeTestHelpers.cmake b/src/testinternal/3rdparty/cmake/QtRunCMakeTestHelpers.cmake
index cc3cff95c7c..29f59d1f2be 100644
--- a/src/testinternal/3rdparty/cmake/QtRunCMakeTestHelpers.cmake
+++ b/src/testinternal/3rdparty/cmake/QtRunCMakeTestHelpers.cmake
@@ -20,6 +20,10 @@ macro(add_RunCMake_test test)
   if(CMAKE_C_COMPILER_ID STREQUAL "LCC")
     list(APPEND TEST_ARGS -DRunCMake_TEST_LCC=1)
   endif()
+  # Qt specific options
+  list(APPEND TEST_ARGS
+    -D_Qt6CTestMacros=${_Qt6CTestMacros}
+  )
   add_test(NAME RunCMake.${test} COMMAND ${CMAKE_COMMAND}
     -DCMAKE_MODULE_PATH=${RunCMakeDir}
     -DRunCMake_GENERATOR_IS_MULTI_CONFIG=${_isMultiConfig}
diff --git a/src/testinternal/3rdparty/cmake/patches/0004-Propagate-_Qt6CTestMacros.patch b/src/testinternal/3rdparty/cmake/patches/0004-Propagate-_Qt6CTestMacros.patch
new file mode 100644
index 00000000000..d45c1e6ea7e
--- /dev/null
+++ b/src/testinternal/3rdparty/cmake/patches/0004-Propagate-_Qt6CTestMacros.patch
@@ -0,0 +1,19 @@
+Index: src/testinternal/3rdparty/cmake/QtRunCMakeTestHelpers.cmake
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/src/testinternal/3rdparty/cmake/QtRunCMakeTestHelpers.cmake b/src/testinternal/3rdparty/cmake/QtRunCMakeTestHelpers.cmake
+--- a/src/testinternal/3rdparty/cmake/QtRunCMakeTestHelpers.cmake	(revision b23da37d71bde4673fab3510596514e4ac451053)
++++ b/src/testinternal/3rdparty/cmake/QtRunCMakeTestHelpers.cmake	(revision e71805860401b494ab3b6e1c12eaa1c84fd89994)
+@@ -20,6 +20,10 @@
+   if(CMAKE_C_COMPILER_ID STREQUAL "LCC")
+     list(APPEND TEST_ARGS -DRunCMake_TEST_LCC=1)
+   endif()
++  # Qt specific options
++  list(APPEND TEST_ARGS
++    -D_Qt6CTestMacros=${_Qt6CTestMacros}
++  )
+   add_test(NAME RunCMake.${test} COMMAND ${CMAKE_COMMAND}
+     -DCMAKE_MODULE_PATH=${RunCMakeDir}
+     -DRunCMake_GENERATOR_IS_MULTI_CONFIG=${_isMultiConfig}