From 079b8b16d2fe3470d6dcf32c52a2611f789981f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Sun, 16 Jun 2024 18:22:38 +0200
Subject: [PATCH] tst_qmakelib: Account for test directory with spaces in
 system() test

Change-Id: Icb695fe40de9d72524c191c0d593c8f2ab746790
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit da3997af0d87aa8ebe25a195c08130f69c6b19e5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/tools/qmakelib/evaltest.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/auto/tools/qmakelib/evaltest.cpp b/tests/auto/tools/qmakelib/evaltest.cpp
index d36265eb921..9d22aa2758c 100644
--- a/tests/auto/tools/qmakelib/evaltest.cpp
+++ b/tests/auto/tools/qmakelib/evaltest.cpp
@@ -2463,10 +2463,10 @@ void tst_qmakelib::addTestFunctions(const QString &qindir)
 #else
                "pwd"
 #endif
-               "> '" + QMakeEvaluator::quoteValue(ProString(QDir::toNativeSeparators(
-                            m_outdir + "/system_out.txt"))) + "): OK = 1\n"
-               "DIR = $$cat(" + QMakeEvaluator::quoteValue(ProString(
-                            m_outdir + "/system_out.txt")) + ")"
+               "> " + QMakeEvaluator::quoteValue(ProString(QDir::toNativeSeparators(
+                             m_outdir + "/system_out.txt"))) + "'): OK = 1\n"
+               "DIR = $$quote($$cat(" + QMakeEvaluator::quoteValue(ProString(
+                             m_outdir + "/system_out.txt")) + "))"
             << "OK = 1\nDIR = " + QMakeEvaluator::quoteValue(ProString(QDir::toNativeSeparators(m_indir)))
             << ""
             << true;