summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlessandro Portale <alessandro.portale@qt.io>2019-11-29 22:16:35 +0100
committerAlessandro Portale <alessandro.portale@qt.io>2019-12-02 05:52:51 +0000
commite69f8f20489db9c5bb8ab083a014a104f958fe59 (patch)
tree24565a914c44279ce31b24c67a0dad9567067942 /src
parent0afc338f3c260104348d38c1cd2b32803a197afa (diff)
downloadqt-creator-e69f8f20489db9c5bb8ab083a014a104f958fe59.tar.gz
ProjectExplorer: Quote path in msvc_make.bat
Make the wrapper script more robust against spaces in the path of the build tool. The Qt Sdk installer installs Qt Creator Preview into paths with spaces, together with a copy of jom.exe. The call of that jom.exe needs to be in quotes. Task-number: QTCREATORBUG-23174 Change-Id: Iffd958362cbce222f05a8505d9f8417d549afa11 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/projectexplorer/msvctoolchain.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp
index fbdefa7996..adc925281b 100644
--- a/src/plugins/projectexplorer/msvctoolchain.cpp
+++ b/src/plugins/projectexplorer/msvctoolchain.cpp
@@ -1178,7 +1178,7 @@ static QString wrappedMakeCommand(const QString &command)
return command;
QTextStream stream(&wrapper);
stream << "chcp 65001\n";
- stream << command << " %*";
+ stream << "\"" << QDir::toNativeSeparators(command) << "\" %*";
return wrapperPath;
}