Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
  Update qttools (fix compile)
  qtwebkit: force separate_debug_info off
  Update qtwebkit (fix compile)
  Update submodule reference to the latest.
  Update the head for qtsystems submodule.
  Enable the build for QtSystems by default.

qt.pro

@@ -76,8 +76,6 @@ module_qtsensors.depends = module_qtbase module_qtdeclarative
 module_qtsystems.subdir = $$IN_PWD/qtsystems
 module_qtsystems.target = module-qtsystems
 module_qtsystems.depends = module_qtbase module_qtdeclarative
-# not yet enabled by default
-module_qtsystems.CONFIG = no_default_target no_default_install
 
 module_qtmultimediakit.subdir = $$IN_PWD/qtmultimediakit
 module_qtmultimediakit.target = module-qtmultimediakit

qtwebkit.pri

@@ -30,6 +30,11 @@ contains(DS, /) {
     GNUTOOLS = $$quote("set \"PATH=$$PWD/gnuwin32/bin;%PATH%\" &&")
 }
 
+# Any configuration making use of QMAKE_POST_LINK will not work for this project,
+# since the building is done by webkit's own build script and qmake at this level
+# does not know the real TARGET.  Disable them here.
+CONFIG -= separate_debug_info
+
 exists($$PWD/qtwebkit/WebKitTools):qtwebkit_tools_dir = WebKitTools
 else:qtwebkit_tools_dir = Tools