summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-09-13 14:56:32 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-09-13 15:27:40 (GMT)
commit019032c93b7397c7239ec99ec44b4923df31533b (patch)
tree71372f683abc8554596d5c50b74473be1dd7bca0 /qmake
parente6b2bb6d6a48e722311cd2c5fd86c015eab24b4d (diff)
downloadQt-019032c93b7397c7239ec99ec44b4923df31533b.zip
Qt-019032c93b7397c7239ec99ec44b4923df31533b.tar.gz
Qt-019032c93b7397c7239ec99ec44b4923df31533b.tar.bz2
run depend_command even if the binary has no absolute path
this magic is a bit braindead anyway, but whatever. Reviewed-by: joerg Task-number: QTBUG-13366
Diffstat (limited to 'qmake')
-rw-r--r--qmake/generators/makefile.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index c7b1473..cd034b8 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -1794,10 +1794,10 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t)
const QString c = Option::fixPathToLocalOS(cmdline.at(argv0), true);
if(exists(c)) {
cmdline[argv0] = escapeFilePath(Option::fixPathToLocalOS(cmdline.at(argv0), false));
- tmp_dep_cmd = cmdline.join(" ");
} else {
cmdline[argv0] = escapeFilePath(cmdline.at(argv0));
}
+ tmp_dep_cmd = cmdline.join(" ");
}
dep_cd_cmd = QLatin1String("cd ")
+ escapeFilePath(Option::fixPathToLocalOS(Option::output_dir, false))