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

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (54 commits)
  Apply f176759fc41abc4cb901c2cbaa15264f2a9ac85b to stdout too.
  Autotest: add some debugging, just in case there's something wrong
  Autotest: fix the fix for the rounding error.
  Fix compile error with QT_NO_LIBRARY in QtMultimedia
  the _setmode() prototype is different on win ce
  qdoc: Changed qdoc to output the new doc format.
  Doc: update 'developing on mac'
  fcntl.h doesn't seem to exist, either - contrary to an example on msdn
  Autotest: fix paths on the test server after update.
  Force the repaint during a window resize.
  fix compile on wince
  remove CONFIG += ordered again
  Assistant: Check namespace and virtual folder syntax of help projects.
  QtHelp: Fix auto tests.
  Fix a crash when unloading libQtCore
  Introduce a qconfig feature for QtDBus
  Fix build after MR 543 merged.
  Compile on 10.4.
  revert "Fix the Qt build on Mac OS X/Cocoa 64-bit"
  Remove expected failures after JavaScriptCore bug fix
  ...

1 files changed, 22 insertions, 19 deletions

diff --git a/tools/tools.pro b/tools/tools.pro
index 3ed07b1..99a965d 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -1,32 +1,35 @@
 TEMPLATE        = subdirs
 
-no-png {
-    message("Some graphics-related tools are unavailable without PNG support")
-} else {
-     SUBDIRS += assistant \
-		pixeltool \
-		porting \
-                qtestlib \
-                qttracereplay
-     contains(QT_EDITION, Console) {
-         SUBDIRS += designer/src/uitools     # Linguist depends on this
-     } else {
-         SUBDIRS += designer
-     }
-     SUBDIRS     += linguist
-     symbian: SUBDIRS = designer
-     wince*: SUBDIRS = qtestlib designer
-     unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig
-     win32:!wince*:SUBDIRS += activeqt
+!contains(QT_CONFIG, no-gui) {
+    no-png {
+        message("Some graphics-related tools are unavailable without PNG support")
+    } else {
+         SUBDIRS += assistant \
+		    pixeltool \
+		    porting \
+                    qtestlib \
+                    qttracereplay
+         contains(QT_EDITION, Console) {
+             SUBDIRS += designer/src/uitools     # Linguist depends on this
+         } else {
+             SUBDIRS += designer
+         }
+         symbian: SUBDIRS = designer
+         wince*: SUBDIRS = qtestlib designer
+         unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig
+         win32:!wince*:SUBDIRS += activeqt
+    }
+    contains(QT_CONFIG, declarative):SUBDIRS += qml
 }
 
+SUBDIRS     += linguist
+
 mac {
     SUBDIRS += macdeployqt
 }
 
 embedded:SUBDIRS += kmap2qmap
 
-contains(QT_CONFIG, declarative):SUBDIRS += qml
 contains(QT_CONFIG, dbus):SUBDIRS += qdbus
 !wince*:contains(QT_CONFIG, xmlpatterns): SUBDIRS += xmlpatterns xmlpatternsvalidator
 embedded: SUBDIRS += makeqpf