From 1ea709889e36128b5efff5ecccb3ab8a0ef41f27 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 31 Aug 2012 17:56:49 +0200 Subject: [PATCH] fix path separator in system() for bootstrapped builds on windows Change-Id: Ic472eb88f9d253fc182fb5c776560443c810321f Reviewed-by: Daniel Teske --- src/shared/proparser/qmakebuiltins.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shared/proparser/qmakebuiltins.cpp b/src/shared/proparser/qmakebuiltins.cpp index 051dcf0fa0a..ca8dbea559f 100644 --- a/src/shared/proparser/qmakebuiltins.cpp +++ b/src/shared/proparser/qmakebuiltins.cpp @@ -353,7 +353,7 @@ QByteArray QMakeEvaluator::getCommandOutput(const QString &args) const #else QByteArray out; if (FILE *proc = QT_POPEN(QString(QLatin1String("cd ") - + IoUtils::shellQuote(currentDirectory()) + + IoUtils::shellQuote(QDir::toNativeSeparators(currentDirectory())) + QLatin1String(" && ") + args).toLocal8Bit().constData(), "r")) { while (!feof(proc)) { char buff[10 * 1024]; @@ -1431,7 +1431,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional( return returnBool(proc.exitStatus() == QProcess::NormalExit && proc.exitCode() == 0); #else return returnBool(system((QLatin1String("cd ") - + IoUtils::shellQuote(currentDirectory()) + + IoUtils::shellQuote(QDir::toNativeSeparators(currentDirectory())) + QLatin1String(" && ") + args.at(0)).toLocal8Bit().constData()) == 0); #endif }