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.

18 files changed, 5 insertions, 2 deletions

diff --git a/qt.pro b/qt.pro
index 754bbec4..e569beb4 100644
--- a/qt.pro
+++ b/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
diff --git a/qtactiveqt b/qtactiveqt
-Subproject 01d455e2019b31e1a3e90da499d37b135b7e699
+Subproject 677e6b7c889e67ac7ae7b7df66500f43bf80e89
diff --git a/qtbase b/qtbase
-Subproject 1fb4d6737c09a5d6e1bbcf135029cd0a7f2e72f
+Subproject fa65123a86529bbbdaf2b774d741400a3dbfd59
diff --git a/qtdeclarative b/qtdeclarative
-Subproject e789d98c03a8f235520667df6fd27fab9e66055
+Subproject e41318cbb9261e65ddc164cd1811cb911bd7015
diff --git a/qtdoc b/qtdoc
-Subproject 7e58eff39b1a7c3e093128ee3726d97031a2f06
+Subproject b95a67c03b7e8d6b3d7298b961c85d99a0559bb
diff --git a/qtlocation b/qtlocation
-Subproject 1dd8b4805d108931a41eb2d58874a598281ee2c
+Subproject 8acf30adfa51aba4ee0f2fdd71c9c50e9c759a2
diff --git a/qtmultimedia b/qtmultimedia
-Subproject d400cf2b807761571424cf8d9051505d2b1c117
+Subproject 9d24cb54d983d5f32481793f27d6cf7794b3859
diff --git a/qtphonon b/qtphonon
-Subproject db5f67926ebb5430cc75d00a8d39614c9ce5cda
+Subproject 0b6ab62b87aaaf362c4ac33f568bd21488e7511
diff --git a/qtqa b/qtqa
-Subproject 0316a4af9941ce4bb63ba5380777f75d4dea7c7
+Subproject 447e1ff970c64ba581ddca1a66d9737b5a2cd6c
diff --git a/qtrepotools b/qtrepotools
-Subproject 61dca1cf8029c9ddcf71e81e149ace6bed49f51
+Subproject b4dcc01ace485c248aa2613954ca8cf1fc02700
diff --git a/qtscript b/qtscript
-Subproject d9c4d635722d027c2b05cd54f1a44f3ebfdb29d
+Subproject 9fef9f368f3a9522b81f4f1509decfb5f94461a
diff --git a/qtsensors b/qtsensors
-Subproject bc72e14225e7f03ae3134858e271463d560b760
+Subproject 1495f8434a7e18d256ab27d3f221ac6718ee162
diff --git a/qtsvg b/qtsvg
-Subproject 8c19885edf34ccf9de5de29288d28a00ca44933
+Subproject 0eebae5f2c1ff827ee5ce8748fa7cd677486d26
diff --git a/qtsystems b/qtsystems
-Subproject c0b5b3b6bb20f9b4abb2934c5cbd5a43f41d8b3
+Subproject b5534f832fd0c6c3845caf2b40858afcf048d14
diff --git a/qttools b/qttools
-Subproject 75b8fea08278d5837a6a5e9289a7ce178216f65
+Subproject de73f13a2186a7ccce6b4fd69a018bd611b993c
diff --git a/qtwebkit b/qtwebkit
-Subproject 5ed0c6a101104572d494d53cdfd65a0c8e6e01c
+Subproject 81b8dac16049715b94dc36256bd9f433f7dfacc
diff --git a/qtwebkit.pri b/qtwebkit.pri
index af16a119..05665e0c 100644
--- a/qtwebkit.pri
+++ b/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
 
diff --git a/qtxmlpatterns b/qtxmlpatterns
-Subproject 6f9790b6dd5faff0f55d3316215e883ddcd8abf
+Subproject d2774208f371c612e32a7a5837257247305897c