Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (53 commits)
  removed a few warnings on wince builds
  Removed double setting of _WIN32_WINNT
  QTreeView: remove dead code.
  doc: Clarify effect of QFont::NoFontMerging
  Revert "Implement heightForWidth support for QTabWidget and QStackedLayout."
  build fix for S60
  Improve handling of QAction in soft key manager
  Remove useless assert
  qdrawhelper: fix optim in 2245641ba
  QSlider and StyleSheet: fix one pixel error while drawing the SliderAddPage
  accelerate QWindowsPipeWriter for bigger chunks of data
  Fix antialiasing with transformed text in OpenGL2 paint engine
  Fix flattening of largely scaled, thin, dashed beziers.
  Increased the precision used to flatten beziers
  Fix QT_NO_MOVIE
  Fix compile error with QT_NO_ACTION in QtGui
  Fix QT_NO_COMPLETER
  Fix QT_NO_FSCOMPLETER
  Fix QT_NO_FILESYSTEMMODEL
  Build fix
  ...

2 files changed, 21 insertions, 19 deletions

diff --git a/qmake/generators/metamakefile.cpp b/qmake/generators/metamakefile.cpp
index e76e596..c42a837 100644
--- a/qmake/generators/metamakefile.cpp
+++ b/qmake/generators/metamakefile.cpp
@@ -58,6 +58,8 @@ MetaMakefileGenerator::~MetaMakefileGenerator()
         delete project;
 }
 
+#ifndef QT_QMAKE_PARSER_ONLY
+
 class BuildsMetaMakefileGenerator : public MetaMakefileGenerator
 {
 private:
@@ -489,6 +491,25 @@ MetaMakefileGenerator::createMakefileGenerator(QMakeProject *proj, bool noIO)
     return mkfile;
 }
 
+MetaMakefileGenerator *
+MetaMakefileGenerator::createMetaGenerator(QMakeProject *proj, const QString &name, bool op, bool *success)
+{
+    MetaMakefileGenerator *ret = 0;
+    if ((Option::qmake_mode == Option::QMAKE_GENERATE_MAKEFILE ||
+         Option::qmake_mode == Option::QMAKE_GENERATE_PRL)) {
+        if (proj->first("TEMPLATE").endsWith("subdirs"))
+            ret = new SubdirsMetaMakefileGenerator(proj, name, op);
+    }
+    if (!ret)
+        ret = new BuildsMetaMakefileGenerator(proj, name, op);
+    bool res = ret->init();
+    if (success)
+        *success = res;
+    return ret;
+}
+
+#endif // QT_QMAKE_PARSER_ONLY
+
 bool
 MetaMakefileGenerator::modesForGenerator(const QString &gen,
         Option::HOST_MODE *host_mode, Option::TARG_MODE *target_mode)
@@ -523,21 +544,4 @@ MetaMakefileGenerator::modesForGenerator(const QString &gen,
     return true;
 }
 
-MetaMakefileGenerator *
-MetaMakefileGenerator::createMetaGenerator(QMakeProject *proj, const QString &name, bool op, bool *success)
-{
-    MetaMakefileGenerator *ret = 0;
-    if ((Option::qmake_mode == Option::QMAKE_GENERATE_MAKEFILE ||
-         Option::qmake_mode == Option::QMAKE_GENERATE_PRL)) {
-        if (proj->first("TEMPLATE").endsWith("subdirs"))
-            ret = new SubdirsMetaMakefileGenerator(proj, name, op);
-    }
-    if (!ret)
-        ret = new BuildsMetaMakefileGenerator(proj, name, op);
-    bool res = ret->init();
-    if (success)
-        *success = res;
-    return ret;
-}
-
 QT_END_NAMESPACE
diff --git a/qmake/project.cpp b/qmake/project.cpp
index 56707cf..764264f 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -1507,7 +1507,6 @@ QMakeProject::read(uchar cmd)
 
 void QMakeProject::validateModes()
 {
-#if !defined(QT_BUILD_QMAKE_NO_GENERATORS)
     if (Option::host_mode == Option::HOST_UNKNOWN_MODE
         || Option::target_mode == Option::TARG_UNKNOWN_MODE) {
         Option::HOST_MODE host_mode;
@@ -1544,7 +1543,6 @@ void QMakeProject::validateModes()
             }
         }
     }
-#endif // !defined(QT_BUILD_QMAKE_NO_GENERATORS)
 }
 
 bool