Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into master-integration

* 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fixed the host detection in qmake profiles.
  Improving parts of commit 2d8d855d.
  qmake: add Linux host support to Symbian generator
  Fixed indentation.
  Add Linux host support to Symbian mkspecs.
  Linux support for platform specific commands in .pro files.
  Add createpackage.bat equivalent for Unix systems.
  Make all Symbian #includes lower case.
  mkspecs: fix warning when calling qmake
  Fix portability problems in bin/createpackage.pl.

1 files changed, 8 insertions, 2 deletions

diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 7424d1d..0f5bdcd 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) {