diff options
| author | Oswald Buddenhagen <[email protected]> | 2012-08-31 17:56:49 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <[email protected]> | 2012-09-03 19:43:40 +0200 |
| commit | 1ea709889e36128b5efff5ecccb3ab8a0ef41f27 (patch) | |
| tree | 1632140ebd4510e0e413cafe2ac24a279c1a477a /src | |
| parent | da62508d7845897009502c4721663c6d579c106a (diff) | |
fix path separator in system() for bootstrapped builds on windows
Change-Id: Ic472eb88f9d253fc182fb5c776560443c810321f
Reviewed-by: Daniel Teske <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/shared/proparser/qmakebuiltins.cpp | 4 |
1 files 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 } |