diff options
author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-28 14:26:40 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-30 17:05:01 +0000 |
commit | e3ca4287d99a8b1a5769c19b97679cd95b4e83e4 (patch) | |
tree | 5db7cd406272cfa5f75afb5f218a8e4257a8f662 /qmake/generators/win32/msvc_vcproj.cpp | |
parent | 1e4054ce2f4f7b488b5d4963f32d4025e20cf537 (diff) |
qmake: fix execution of depend_command in directories with funny names
it's wrong to use the escape function for makefiles, as the command
goes directly to a popen() call.
Task-number: QTBUG-57343
Change-Id: I34a8e4d8fb406303c593e7c1e24019e0f756e7f8
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'qmake/generators/win32/msvc_vcproj.cpp')
-rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 7b3d7fd160..018c70089d 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -29,16 +29,22 @@ #include "msvc_vcproj.h" #include "option.h" #include "xmloutput.h" + +#include <ioutils.h> + #include <qdir.h> #include <qdiriterator.h> #include <qcryptographichash.h> #include <qregexp.h> #include <qhash.h> #include <quuid.h> + #include <stdlib.h> //#define DEBUG_SOLUTION_GEN +using namespace QMakeInternal; + QT_BEGIN_NAMESPACE // Filter GUIDs (Do NOT change these!) ------------------------------ const char _GUIDSourceFiles[] = "{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"; @@ -1550,7 +1556,7 @@ void VcprojGenerator::initResourceFiles() dep_cmd = Option::fixPathToLocalOS(dep_cmd, true, false); if(canExecute(dep_cmd)) { dep_cmd.prepend(QLatin1String("cd ") - + escapeFilePath(Option::fixPathToLocalOS(Option::output_dir, false)) + + IoUtils::shellQuote(Option::fixPathToLocalOS(Option::output_dir, false)) + QLatin1String(" && ")); if (FILE *proc = QT_POPEN(dep_cmd.toLatin1().constData(), QT_POPEN_READ)) { QString indeps; |