Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into tqtc/lts-5.15-opensourcev5.15.9-lts-lgpl5.15

Change-Id: Iaff6b55275e50d19973e1020853d8622587069f9

1 files changed, 8 insertions, 1 deletions

diff --git a/tests/auto/corelib/kernel/qsystemsemaphore/tst_qsystemsemaphore.cpp b/tests/auto/corelib/kernel/qsystemsemaphore/tst_qsystemsemaphore.cpp
index 5f010ae3d1..a73d806067 100644
--- a/tests/auto/corelib/kernel/qsystemsemaphore/tst_qsystemsemaphore.cpp
+++ b/tests/auto/corelib/kernel/qsystemsemaphore/tst_qsystemsemaphore.cpp
@@ -70,7 +70,14 @@ private:
 };
 
 tst_QSystemSemaphore::tst_QSystemSemaphore()
-    : m_helperBinary("acquirerelease_helper")
+    :
+#ifdef Q_OS_WIN
+    // On windows the CWD is not the same as the test binary, so we cannot use the ./ path.
+    m_helperBinary("acquirerelease_helper")
+#else
+    // But on Unix we *must*
+    m_helperBinary("./acquirerelease_helper")
+#endif
 {
 }