From 62ad0014f12ed05863f408b9b748856222e27a58 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Tue, 7 Nov 2023 19:17:41 +0100
Subject: [PATCH] TaskTree test: Simplify subprocess name

Fix the qbs build.

Amends 63bfeba87f3ce2d42655548dfb097dc9e0bf26ab

Change-Id: I271e5059ba8becf4aade8ce21ff9f40201f3734b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 tests/auto/solutions/qprocesstask/CMakeLists.txt          | 2 +-
 tests/auto/solutions/qprocesstask/qprocesstask.qbs        | 2 +-
 tests/auto/solutions/qprocesstask/testsleep/testsleep.qbs | 3 +++
 tests/auto/solutions/qprocesstask/tst_qprocesstask.cpp    | 8 +-------
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/tests/auto/solutions/qprocesstask/CMakeLists.txt b/tests/auto/solutions/qprocesstask/CMakeLists.txt
index dab250943cf..c1b1fd5396a 100644
--- a/tests/auto/solutions/qprocesstask/CMakeLists.txt
+++ b/tests/auto/solutions/qprocesstask/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_subdirectory(testsleep)
 
 add_qtc_test(tst_qprocesstask
-  DEFINES "PROCESS_TESTAPP=\"${CMAKE_CURRENT_BINARY_DIR}/testsleep\""
+  DEFINES "PROCESS_TESTAPP=\"${CMAKE_CURRENT_BINARY_DIR}/testsleep/testsleep\""
   DEPENDS Tasking Qt::Network
   SOURCES tst_qprocesstask.cpp
 )
diff --git a/tests/auto/solutions/qprocesstask/qprocesstask.qbs b/tests/auto/solutions/qprocesstask/qprocesstask.qbs
index c1bc1ce889d..863c1b0bd82 100644
--- a/tests/auto/solutions/qprocesstask/qprocesstask.qbs
+++ b/tests/auto/solutions/qprocesstask/qprocesstask.qbs
@@ -15,7 +15,7 @@ Project  {
             if (qbs.targetOS === "windows")
                 defines.push("_CRT_SECURE_NO_WARNINGS");
             defines.push('PROCESS_TESTAPP="'
-                         + FileInfo.joinPaths(destinationDirectory, "testsleep") + '"');
+                         + FileInfo.joinPaths(destinationDirectory, "testsleep/testsleep") + '"');
             return defines;
         }
         destinationDirectory: project.buildDirectory + '/'
diff --git a/tests/auto/solutions/qprocesstask/testsleep/testsleep.qbs b/tests/auto/solutions/qprocesstask/testsleep/testsleep.qbs
index ae9bbd9431d..5d8db7b2f8f 100644
--- a/tests/auto/solutions/qprocesstask/testsleep/testsleep.qbs
+++ b/tests/auto/solutions/qprocesstask/testsleep/testsleep.qbs
@@ -9,4 +9,7 @@ QtApplication {
     files: [
         "main.cpp",
     ]
+
+    destinationDirectory: project.buildDirectory + '/'
+                          + FileInfo.relativePath(project.ide_source_tree, sourceDirectory)
 }
diff --git a/tests/auto/solutions/qprocesstask/tst_qprocesstask.cpp b/tests/auto/solutions/qprocesstask/tst_qprocesstask.cpp
index f4bff2e0981..3efd3fe465e 100644
--- a/tests/auto/solutions/qprocesstask/tst_qprocesstask.cpp
+++ b/tests/auto/solutions/qprocesstask/tst_qprocesstask.cpp
@@ -15,16 +15,10 @@ private slots:
     void qProcessTask();
 };
 
-#ifdef Q_OS_WIN
-static const char s_processName[] = "testsleep.exe";
-#else
-static const char s_processName[] = "testsleep";
-#endif
-
 void tst_QProcessTask::qProcessTask()
 {
     const auto setupProcess = [](QProcess &process) {
-        process.setProgram(QLatin1String(PROCESS_TESTAPP) + '/' + s_processName);
+        process.setProgram(QLatin1String(PROCESS_TESTAPP));
     };
 
     {