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

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (192 commits)
  Fix dependency so it works also on massive parrallel systems
  This should likely get webkit linking again on windows/sbsv2
  Fixed Symbian applications with DESTDIR set.
  Removed a warning about generated rss files.
  Revert "Temporarily disable problematic dll."
  Fixed "Cannot install protected application" message on Symbian.
  Worked around a crash in the elf2e32 postlinker tool.
  Worked around case differences in Symbian^3 and Gnupoc.
  Enabled compilation of plugins again.
  Fixed a building bug where the DLL entry point was undefined.
  Moved UID2 processing from cpp code to profiles.
  Added rpp and rsg files to ignore filter.
  Moved two profiles to the correct directory.
  Fix build break caused by undefined symbol SetDialogPreference
  Temporarily disable problematic dll.
  Use the same concept for per-lib tweaks as armcc
  Consistently use the * in configure
  Symbian doesn't have large file support currently, just turn it off
  Remove largefile config test
  Make sure that we have all compile flags available always
  ...

1 files changed, 1 insertions, 1 deletions

diff --git a/qmake/generators/unix/unixmake.h b/qmake/generators/unix/unixmake.h
index 77bdd01..0ea3350 100644
--- a/qmake/generators/unix/unixmake.h
+++ b/qmake/generators/unix/unixmake.h
@@ -49,7 +49,6 @@ QT_BEGIN_NAMESPACE
 class UnixMakefileGenerator : public MakefileGenerator
 {
     bool init_flag, include_deps;
-    bool writeMakefile(QTextStream &);
     QString libtoolFileName(bool fixify=true);
     void writeLibtoolFile();     // for libtool
     QString pkgConfigPrefix() const;
@@ -75,6 +74,7 @@ protected:
     virtual void init();
 
     void writeMakeParts(QTextStream &);
+    bool writeMakefile(QTextStream &);
 
 private:
     void init2();