Updated submodules (merged refactor) master_201109221341
authorRohan McGovern <rohan.mcgovern@nokia.com>
Sun, 18 Sep 2011 22:57:00 +0000 (08:57 +1000)
committerQt by Nokia <qt-info@nokia.com>
Thu, 22 Sep 2011 03:28:19 +0000 (05:28 +0200)
This commit updates all applicable submodules past the merge of the
refactor branches.

Dependencies for qtlocation and qtdoc in qt.pro were fixed to match
the latest dependencies in those modules.

Change-Id: I0000000000000d80ddaf92f258714ab4a2750cb7
Reviewed-on: http://codereview.qt-project.org/5109
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
20 files changed:
qt.pro
qtactiveqt
qtbase
qtconnectivity
qtdeclarative
qtdoc
qtlocation
qtmultimediakit
qtphonon
qtpim
qtqa
qtquick3d
qtrepotools
qtscript
qtsensors
qtsvg
qtsystems
qttools
qttranslations
qtxmlpatterns

diff --git a/qt.pro b/qt.pro
index 950aa9a..83eae2e 100644 (file)
--- a/qt.pro
+++ b/qt.pro
@@ -47,7 +47,7 @@ module_qttranslations.depends = module_qttools
 
 module_qtdoc.subdir = $$IN_PWD/qtdoc
 module_qtdoc.target = module-qtdoc
-module_qtdoc.depends = module_qtbase
+module_qtdoc.depends = module_qtbase module_qtdeclarative
 
 module_qtactiveqt.subdir = $$IN_PWD/qtactiveqt
 module_qtactiveqt.target = module-qtactiveqt
@@ -63,7 +63,9 @@ module_qtqa.depends = module_qtbase
 
 module_qtlocation.subdir = $$IN_PWD/qtlocation
 module_qtlocation.target = module-qtlocation
-module_qtlocation.depends = module_qtbase module_qtdeclarative
+module_qtlocation.depends = module_qtbase module_qtdeclarative module_qtquick3d module_qtscript
+# temporarily disabled to resolve deadlock as commented on http://codereview.qt-project.org/5337
+module_qtlocation.CONFIG = no_default_target no_default_install
 
 module_qtsensors.subdir = $$IN_PWD/qtsensors
 module_qtsensors.target = module-qtsensors
index b556a30..eb08493 160000 (submodule)
@@ -1 +1 @@
-Subproject commit b556a302532fffc5f03671906b0ae4769a9a37be
+Subproject commit eb0849338fc951c7efe758de5b50276b83219ac4
diff --git a/qtbase b/qtbase
index 8ed47d9..98baa28 160000 (submodule)
--- a/qtbase
+++ b/qtbase
@@ -1 +1 @@
-Subproject commit 8ed47d961dc7e6f161030654d11cd330a542eadf
+Subproject commit 98baa289cc38af3537b6dff60b1eedf98a069743
index 99e3bd6..ee26c3c 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 99e3bd6b160f82e2bdace4d5ec8ffd3711bdcba1
+Subproject commit ee26c3cb2f681e5b5bf65fbea14f2cec53b4224d
index 87bb76a..b4001ea 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 87bb76ae8b59f5b504c49e242e24d6867f8b7789
+Subproject commit b4001eacd6472a3515a0eb7d80e845bd733d5bcd
diff --git a/qtdoc b/qtdoc
index c2d0cdb..1eb722c 160000 (submodule)
--- a/qtdoc
+++ b/qtdoc
@@ -1 +1 @@
-Subproject commit c2d0cdb055f6e193cb85c6dba765fbc7a18c55b7
+Subproject commit 1eb722c5f855ad654d158b1fb9ae8366f28db657
index 6cd54ea..75ee615 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 6cd54ea696b87c01a16b7fcaba6405f62882370a
+Subproject commit 75ee6157a35e3b9ce6dc9fd8f424591b48592d8a
index 7507c80..cf8ef33 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 7507c80524e486c22242928b99b9e6340464a617
+Subproject commit cf8ef332bac1d82a9497b487665a785918092312
index 9a3d421..51e68aa 160000 (submodule)
--- a/qtphonon
+++ b/qtphonon
@@ -1 +1 @@
-Subproject commit 9a3d42149f6312d18d06aee3625aeba121efa931
+Subproject commit 51e68aa13a39ea978ae0eaa05aa4b23ac91708b4
diff --git a/qtpim b/qtpim
index cd15001..d68057a 160000 (submodule)
--- a/qtpim
+++ b/qtpim
@@ -1 +1 @@
-Subproject commit cd150014154846027e169e34b8557a3ce5ad94a9
+Subproject commit d68057a4b412ed2a518ad7759771838d372f12cb
diff --git a/qtqa b/qtqa
index 2e75878..ef644c1 160000 (submodule)
--- a/qtqa
+++ b/qtqa
@@ -1 +1 @@
-Subproject commit 2e758788739c943cdccfc55f5e37b62286ca1726
+Subproject commit ef644c1c00d5cce1b185856e46102a339365c9bb
index d581f80..8065b2c 160000 (submodule)
--- a/qtquick3d
+++ b/qtquick3d
@@ -1 +1 @@
-Subproject commit d581f80308cda6bd59048743de6ea0e3ccebfb0a
+Subproject commit 8065b2cce01f7d8ca3e6bef79064f9e37070ca4f
index 9f8086a..16fe609 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 9f8086a960a3040445574a9ae99bb69b3a7e1baf
+Subproject commit 16fe6097342fd2070b3a04c66a31a81e1704f4d5
index 7a954f4..6ae933f 160000 (submodule)
--- a/qtscript
+++ b/qtscript
@@ -1 +1 @@
-Subproject commit 7a954f4f8846aeece67aab7a74507f5904ccd436
+Subproject commit 6ae933fa3e88f46cc43a24885ef08a15c3f19983
index 6f390c5..08991e3 160000 (submodule)
--- a/qtsensors
+++ b/qtsensors
@@ -1 +1 @@
-Subproject commit 6f390c5d4abd460e80c6c07cc0c885d53db865c1
+Subproject commit 08991e3ff72d8203db8b7fc2f2659bfcdc24e408
diff --git a/qtsvg b/qtsvg
index 8bd0f4a..35fa26e 160000 (submodule)
--- a/qtsvg
+++ b/qtsvg
@@ -1 +1 @@
-Subproject commit 8bd0f4a9d6cff4a9dcb6b829208877f2ab798dad
+Subproject commit 35fa26ea1cefa2f76ddf77f8ad67f9021f37ee7f
index 1ad74a1..3b2218d 160000 (submodule)
--- a/qtsystems
+++ b/qtsystems
@@ -1 +1 @@
-Subproject commit 1ad74a1dddcc3c46acac8381dc7ebc8836e80b97
+Subproject commit 3b2218dfe58b4399084a54becf1dc449a545aa67
diff --git a/qttools b/qttools
index 2bcefb5..ed8a005 160000 (submodule)
--- a/qttools
+++ b/qttools
@@ -1 +1 @@
-Subproject commit 2bcefb502f9059e7109cb9bb831215360c0ce8e3
+Subproject commit ed8a00522837f6d172c92d19f813d927fda328d0
index 090e46c..fe53283 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 090e46c777e040507cf595b0f8ae92b1e67cc924
+Subproject commit fe5328346320fbf4ab6b5bfbbac8c014583151b3
index 7137785..e15d4c7 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 7137785c87497f8beb5bda20505466430c6b1521
+Subproject commit e15d4c73762ca8b21acebe581c520bcd06a8d867