diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-06-07 13:09:51 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-10-23 09:25:55 (GMT) |
| commit | a9c7246c6bfddbc69acceb81134a7856e2855dcd (patch) | |
| tree | 84a56213be9b4d2b65cf2f2a205cbe97a0ce045e /qmake | |
| parent | 8b8bbf397114db7eac0873ba622505d2d75c9dfa (diff) | |
| download | Qt-a9c7246c6bfddbc69acceb81134a7856e2855dcd.zip Qt-a9c7246c6bfddbc69acceb81134a7856e2855dcd.tar.gz Qt-a9c7246c6bfddbc69acceb81134a7856e2855dcd.tar.bz2 | |
Fix symbian builds on Linux.
Avoid the use of cmd.exe syntax through the use of Option::shellPath
instead of isForSymbian() in qmake.
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/makefile.cpp | 4 | ||||
| -rw-r--r-- | qmake/option.cpp | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 388e64f..2bf9e7b 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -1795,7 +1795,7 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t) tmp_clean = tmp_out; if(tmp_clean.indexOf("${QMAKE_") == -1) { t << "\n\t" << "-$(DEL_FILE) " << tmp_clean; - if (isForSymbian()) + if (Option::shellPath.isEmpty()) t << " 2> NUL"; // Eliminate unnecessary warnings wrote_clean = true; } @@ -1825,7 +1825,7 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t) } } if(!cleans.isEmpty()) - if (isForSymbian()) + if (Option::shellPath.isEmpty()) t << valGlue(cleans, "\n\t" + del_statement, " 2> NUL\n\t" + del_statement, " 2> NUL"); else t << valGlue(cleans, "\n\t" + del_statement, "\n\t" + del_statement, ""); diff --git a/qmake/option.cpp b/qmake/option.cpp index c503b08..646086f 100644 --- a/qmake/option.cpp +++ b/qmake/option.cpp @@ -389,6 +389,7 @@ Option::init(int argc, char **argv) Option::shellPath = detectShellPath(); #else Option::dirlist_sep = ":"; + Option::shellPath = QStringList("sh"); #endif Option::sysenv_mod = "QMAKE_ENV_"; Option::field_sep = ' '; |