diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-15 14:26:34 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-15 14:26:34 (GMT) |
| commit | 89805b731bf7d26149e9c7f1ad3e11c9dd3f7754 (patch) | |
| tree | 40dafcf7c2b2e263fd17e5c97c1d28fd07172fd1 | |
| parent | 2344254329a6231dab9daf04fa99823c3c68be49 (diff) | |
| parent | 1ca554e1744a8e430483a5df3aa9716c266d0c2c (diff) | |
| download | Qt-89805b731bf7d26149e9c7f1ad3e11c9dd3f7754.zip Qt-89805b731bf7d26149e9c7f1ad3e11c9dd3f7754.tar.gz Qt-89805b731bf7d26149e9c7f1ad3e11c9dd3f7754.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
fix error messages when configuring Qt
| -rw-r--r-- | qmake/generators/makefile.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index cd034b8..3cb1942 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -1797,7 +1797,9 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t) } else { cmdline[argv0] = escapeFilePath(cmdline.at(argv0)); } - tmp_dep_cmd = cmdline.join(" "); + QFileInfo cmdFileInfo(cmdline[argv0]); + if (!cmdFileInfo.isAbsolute() || cmdFileInfo.exists()) + tmp_dep_cmd = cmdline.join(" "); } dep_cd_cmd = QLatin1String("cd ") + escapeFilePath(Option::fixPathToLocalOS(Option::output_dir, false)) |