diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2010-09-15 09:08:29 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2010-09-15 10:16:01 (GMT) |
| commit | 1ca554e1744a8e430483a5df3aa9716c266d0c2c (patch) | |
| tree | 37bfd99702bd8dfa8b9415a108a1c04ebe400e34 | |
| parent | 05ab8ad1577fc038aa2b3bd96cedda54e6a64979 (diff) | |
| download | Qt-1ca554e1744a8e430483a5df3aa9716c266d0c2c.zip Qt-1ca554e1744a8e430483a5df3aa9716c266d0c2c.tar.gz Qt-1ca554e1744a8e430483a5df3aa9716c266d0c2c.tar.bz2 | |
fix error messages when configuring Qt
Commit 019032c93b7397c7239ec99ec44b4923df31533b introduced a lot of
annoying error messages when configuring Qt. It makes qmake complain
that it cannot find rcc and uic, which aren't yet built at this point.
We're now checking for the existence of the depend_command if it is
given as absolute path. This is the case for uic and rcc.
Yeah this is a weak solution for sick code.
Task-number: QTBUG-13366
Reviewed-by: ossi
| -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)) |