diff options
| author | Anderson Lizardo <anderson.lizardo@openbossa.org> | 2009-09-07 00:39:04 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-11-17 09:34:48 (GMT) |
| commit | 2d8d855de79a38e16b9229f3ef9400661e8e3259 (patch) | |
| tree | befc9119e8b21a1b5a9d86417beb3877ba3ad6e9 /qmake/generators/makefile.cpp | |
| parent | 0d6b62e1a31f564b0ad68e3060fb3910d9025791 (diff) | |
| download | Qt-2d8d855de79a38e16b9229f3ef9400661e8e3259.zip Qt-2d8d855de79a38e16b9229f3ef9400661e8e3259.tar.gz Qt-2d8d855de79a38e16b9229f3ef9400661e8e3259.tar.bz2 | |
qmake: add Linux host support to Symbian generator
Signed-off-by: axis <qt-info@nokia.com>
Diffstat (limited to 'qmake/generators/makefile.cpp')
| -rw-r--r-- | qmake/generators/makefile.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 388e64f..f9340f9 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -65,6 +65,12 @@ #include <sys/types.h> #include <sys/stat.h> +#ifdef Q_OS_WIN32 +#define NO_STDERR "2> NUL" +#else +#define NO_STDERR "2>/dev/null" +#endif + QT_BEGIN_NAMESPACE // Well, Windows doesn't have this, so here's the macro @@ -1796,7 +1802,7 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t) if(tmp_clean.indexOf("${QMAKE_") == -1) { t << "\n\t" << "-$(DEL_FILE) " << tmp_clean; if (isForSymbian()) - t << " 2> NUL"; // Eliminate unnecessary warnings + t << " " << NO_STDERR; // Eliminate unnecessary warnings wrote_clean = true; } if(!wrote_clean_cmds || !wrote_clean) { @@ -1826,7 +1832,7 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t) } if(!cleans.isEmpty()) if (isForSymbian()) - t << valGlue(cleans, "\n\t" + del_statement, " 2> NUL\n\t" + del_statement, " 2> NUL"); + t << valGlue(cleans, "\n\t" + del_statement, " " NO_STDERR "\n\t" + del_statement, " " NO_STDERR); else t << valGlue(cleans, "\n\t" + del_statement, "\n\t" + del_statement, ""); if(!wrote_clean_cmds) { |