From e69f8f20489db9c5bb8ab083a014a104f958fe59 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@qt.io>
Date: Fri, 29 Nov 2019 22:16:35 +0100
Subject: [PATCH] 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>
---
 src/plugins/projectexplorer/msvctoolchain.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp
index fbdefa79962..adc925281bb 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;
 }