qtbase: update patch

Update patch after commit ecf8843720a0240dc310c169a4dd605f8f0cab45
touched the patched area.

Pick-to: 6.8
Change-Id: Iba9779539bc9b3ae9e4bd2b96d038534a19f6e6f
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
This commit is contained in:
Mikko Gronoff 2024-07-29 12:56:12 +03:00
parent 515ac91779
commit dee86c6f31

View File

@ -1,4 +1,4 @@
From 07f7e1ae76b24ba64cd87726c438638a8fa3eba0 Mon Sep 17 00:00:00 2001
From 9a8f4cadd4a90e0e5a347bb38210869a5fd28e0f Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Mon, 22 Aug 2022 15:01:28 +0300
Subject: [PATCH] testlib: don't track the build or source directories
@ -7,23 +7,22 @@ Build tests without location of the build and sources directories.
Upstream-Status: Inappropriate [embedded specific]
Change-Id: I8d5add473623a3d9f481097649819c9fb906e4b2
---
src/testlib/CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/testlib/CMakeLists.txt b/src/testlib/CMakeLists.txt
index 6cdb8f3376..3007585e1c 100644
index 15c040a2e3c..913e233a524 100644
--- a/src/testlib/CMakeLists.txt
+++ b/src/testlib/CMakeLists.txt
@@ -121,8 +121,8 @@ set(qt_tc_build_dir_def
"$<IF:${qt_bool_tc_build_dir},${qt_tc_build_dir},$<TARGET_PROPERTY:BINARY_DIR>>"
@@ -149,8 +149,8 @@ set(qt_tc_build_dir_def
string(JOIN "" testcase_dirs_genex
"$<$<NOT:$<BOOL:$<TARGET_PROPERTY:QT_SKIP_DEFAULT_TESTCASE_DIRS>>>:"
- "QT_TESTCASE_BUILDDIR=\"${qt_tc_build_dir_def}\"$<SEMICOLON>"
- "QT_TESTCASE_SOURCEDIR=\"$<TARGET_PROPERTY:SOURCE_DIR>\""
+ "QT_TESTCASE_BUILDDIR=\"\"$<SEMICOLON>"
+ "QT_TESTCASE_SOURCEDIR=\"\""
">"
)
set_property(TARGET Test APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS
- QT_TESTCASE_BUILDDIR="${qt_tc_build_dir_def}"
- QT_TESTCASE_SOURCEDIR="$<TARGET_PROPERTY:SOURCE_DIR>"
+ QT_TESTCASE_BUILDDIR=""
+ QT_TESTCASE_SOURCEDIR=""
)
qt_internal_add_docs(Test