1 files changed, 16 insertions, 18 deletions

diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
index 28a67d9902..4a65d24687 100644
--- a/qmake/generators/win32/msvc_objectmodel.cpp
+++ b/qmake/generators/win32/msvc_objectmodel.cpp
@@ -2295,9 +2295,8 @@ bool VCFilter::addExtraCompiler(const VCFilterFile &info)
         QString cmd, cmd_name, out;
         QStringList deps, inputs;
         // Variabel replacement of output name
-        out = Option::fixPathToTargetOS(
-                    Project->replaceExtraCompilerVariables(tmp_out, inFile, QString()),
-                    false);
+        out = Option::fixPathToTargetOS(Project->replaceExtraCompilerVariables(
+                tmp_out, inFile, QString(), MakefileGenerator::NoShell), false);
 
         // If file has built-in compiler, we've swapped the input and output of
         // the command, as we in Visual Studio cannot have a Custom Buildstep on
@@ -2318,9 +2317,8 @@ bool VCFilter::addExtraCompiler(const VCFilterFile &info)
         if (!tmp_dep_cmd.isEmpty()) {
             // Execute dependency command, and add every line as a dep
             char buff[256];
-            QString dep_cmd = Project->replaceExtraCompilerVariables(tmp_dep_cmd,
-                                                                     Option::fixPathToLocalOS(inFile, true, false),
-                                                                     out);
+            QString dep_cmd = Project->replaceExtraCompilerVariables(
+                        tmp_dep_cmd, inFile, out, MakefileGenerator::LocalShell);
             if(Project->canExecute(dep_cmd)) {
                 dep_cmd.prepend(QLatin1String("cd ")
                                 + Project->escapeFilePath(Option::fixPathToLocalOS(Option::output_dir, false))
@@ -2347,8 +2345,9 @@ bool VCFilter::addExtraCompiler(const VCFilterFile &info)
         }
         for (int i = 0; i < deps.count(); ++i)
             deps[i] = Option::fixPathToTargetOS(
-                        Project->replaceExtraCompilerVariables(deps.at(i), inFile, out),
-                        false).trimmed();
+                        Project->replaceExtraCompilerVariables(
+                                deps.at(i), inFile, out, MakefileGenerator::NoShell),
+                        false);
         // Command for file
         if (combined) {
             // Add dependencies for each file
@@ -2364,28 +2363,27 @@ bool VCFilter::addExtraCompiler(const VCFilterFile &info)
             deps = inputs + deps; // input files themselves too..
 
             // Replace variables for command w/all input files
-            // ### join gives path issues with directories containing spaces!
             cmd = Project->replaceExtraCompilerVariables(tmp_cmd,
-                                                         inputs.join(' '),
-                                                         out);
+                                                         inputs,
+                                                         QStringList(out),
+                                                         MakefileGenerator::TargetShell);
         } else {
             deps.prepend(inFile); // input file itself too..
             cmd = Project->replaceExtraCompilerVariables(tmp_cmd,
                                                          inFile,
-                                                         out);
+                                                         out,
+                                                         MakefileGenerator::TargetShell);
         }
         // Name for command
         if (!tmp_cmd_name.isEmpty()) {
-            cmd_name = Project->replaceExtraCompilerVariables(tmp_cmd_name, inFile, out);
+            cmd_name = Project->replaceExtraCompilerVariables(
+                    tmp_cmd_name, inFile, out, MakefileGenerator::NoShell);
         } else {
             int space = cmd.indexOf(' ');
             if (space != -1)
                 cmd_name = cmd.left(space);
             else
                 cmd_name = cmd;
-            if ((cmd_name[0] == '\'' || cmd_name[0] == '"') &&
-                cmd_name[0] == cmd_name[cmd_name.length()-1])
-                cmd_name = cmd_name.mid(1,cmd_name.length()-2);
         }
 
         // Fixify paths
@@ -2903,7 +2901,7 @@ void VCProjectWriter::write(XmlOutput &xml, VCFilter &tool)
     for (int i = 0; i < tool.Files.count(); ++i) {
         const VCFilterFile &info = tool.Files.at(i);
         xml << tag(q_File)
-                << attrS(_RelativePath, Option::fixPathToLocalOS(info.file))
+                << attrS(_RelativePath, Option::fixPathToTargetOS(info.file))
             << data(); // In case no custom builds, to avoid "/>" endings
         outputFileConfig(tool, xml, tool.Files.at(i).file);
         xml << closetag(q_File);
@@ -2962,7 +2960,7 @@ void VCProjectWriter::outputFilter(VCProject &project, XmlOutput &xml, const QSt
 void VCProjectWriter::outputFileConfigs(VCProject &project, XmlOutput &xml, const VCFilterFile &info, const QString &filtername)
 {
     xml << tag(q_File)
-            << attrS(_RelativePath, Option::fixPathToLocalOS(info.file));
+            << attrS(_RelativePath, Option::fixPathToTargetOS(info.file));
     for (int i = 0; i < project.SingleProjects.count(); ++i) {
         VCFilter filter = project.SingleProjects.at(i).filterByName(filtername);
         if (filter.Config) // only if the filter is not empty