diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-03-29 11:54:38 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-04-12 12:00:36 +0200 |
| commit | a5be47714e5a0075fe9d0ea4a7925136a48e3974 (patch) | |
| tree | d99f14bd34cf781a9b140a478a3ef6b0fbd318b9 /qmake/generators/win32/msvc_objectmodel.cpp | |
| parent | 8b11ebf392d832725185de08c2438d6b8771890b (diff) | |
| download | qt4-tools-a5be47714e5a0075fe9d0ea4a7925136a48e3974.tar.gz | |
run depend_command in build dir in VS generators as well
followup to b139e7e96e5c47b412c4f0bbc4ae11d5cca99e61
Reviewed-by: mariusSO
Diffstat (limited to 'qmake/generators/win32/msvc_objectmodel.cpp')
| -rw-r--r-- | qmake/generators/win32/msvc_objectmodel.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp index 87c89435ba..0a24a01953 100644 --- a/qmake/generators/win32/msvc_objectmodel.cpp +++ b/qmake/generators/win32/msvc_objectmodel.cpp @@ -2218,6 +2218,9 @@ bool VCFilter::addExtraCompiler(const VCFilterFile &info) Option::fixPathToLocalOS(inFile, true, false), out); if(Project->canExecute(dep_cmd)) { + dep_cmd.prepend(QLatin1String("cd ") + + Project->escapeFilePath(Option::fixPathToLocalOS(Option::output_dir, false)) + + QLatin1String(" && ")); if(FILE *proc = QT_POPEN(dep_cmd.toLatin1().constData(), "r")) { QString indeps; while(!feof(proc)) { @@ -2232,7 +2235,7 @@ bool VCFilter::addExtraCompiler(const VCFilterFile &info) for (int i = 0; i < extradeps.count(); ++i) { QString dd = extradeps.at(i).simplified(); if (!dd.isEmpty()) - deps += Project->fileFixify(dd); + deps += Project->fileFixify(dd, QString(), Option::output_dir); } } } |