summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--qt.pro6
m---------qtactiveqt0
m---------qtbase0
m---------qtconnectivity0
m---------qtdeclarative0
m---------qtdoc0
m---------qtlocation0
m---------qtmultimediakit0
m---------qtphonon0
m---------qtpim0
m---------qtqa0
m---------qtquick3d0
m---------qtrepotools0
m---------qtscript0
m---------qtsensors0
m---------qtsvg0
m---------qtsystems0
m---------qttools0
m---------qttranslations0
m---------qtxmlpatterns0
20 files changed, 4 insertions, 2 deletions
diff --git a/qt.pro b/qt.pro
index 950aa9af..83eae2eb 100644
--- 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
diff --git a/qtactiveqt b/qtactiveqt
-Subproject b556a302532fffc5f03671906b0ae4769a9a37b
+Subproject eb0849338fc951c7efe758de5b50276b83219ac
diff --git a/qtbase b/qtbase
-Subproject 8ed47d961dc7e6f161030654d11cd330a542ead
+Subproject 98baa289cc38af3537b6dff60b1eedf98a06974
diff --git a/qtconnectivity b/qtconnectivity
-Subproject 99e3bd6b160f82e2bdace4d5ec8ffd3711bdcba
+Subproject ee26c3cb2f681e5b5bf65fbea14f2cec53b4224
diff --git a/qtdeclarative b/qtdeclarative
-Subproject 87bb76ae8b59f5b504c49e242e24d6867f8b778
+Subproject b4001eacd6472a3515a0eb7d80e845bd733d5bc
diff --git a/qtdoc b/qtdoc
-Subproject c2d0cdb055f6e193cb85c6dba765fbc7a18c55b
+Subproject 1eb722c5f855ad654d158b1fb9ae8366f28db65
diff --git a/qtlocation b/qtlocation
-Subproject 6cd54ea696b87c01a16b7fcaba6405f62882370
+Subproject 75ee6157a35e3b9ce6dc9fd8f424591b48592d8
diff --git a/qtmultimediakit b/qtmultimediakit
-Subproject 7507c80524e486c22242928b99b9e6340464a61
+Subproject cf8ef332bac1d82a9497b487665a78591809231
diff --git a/qtphonon b/qtphonon
-Subproject 9a3d42149f6312d18d06aee3625aeba121efa93
+Subproject 51e68aa13a39ea978ae0eaa05aa4b23ac91708b
diff --git a/qtpim b/qtpim
-Subproject cd150014154846027e169e34b8557a3ce5ad94a
+Subproject d68057a4b412ed2a518ad7759771838d372f12c
diff --git a/qtqa b/qtqa
-Subproject 2e758788739c943cdccfc55f5e37b62286ca172
+Subproject ef644c1c00d5cce1b185856e46102a339365c9b
diff --git a/qtquick3d b/qtquick3d
-Subproject d581f80308cda6bd59048743de6ea0e3ccebfb0
+Subproject 8065b2cce01f7d8ca3e6bef79064f9e37070ca4
diff --git a/qtrepotools b/qtrepotools
-Subproject 9f8086a960a3040445574a9ae99bb69b3a7e1ba
+Subproject 16fe6097342fd2070b3a04c66a31a81e1704f4d
diff --git a/qtscript b/qtscript
-Subproject 7a954f4f8846aeece67aab7a74507f5904ccd43
+Subproject 6ae933fa3e88f46cc43a24885ef08a15c3f1998
diff --git a/qtsensors b/qtsensors
-Subproject 6f390c5d4abd460e80c6c07cc0c885d53db865c
+Subproject 08991e3ff72d8203db8b7fc2f2659bfcdc24e40
diff --git a/qtsvg b/qtsvg
-Subproject 8bd0f4a9d6cff4a9dcb6b829208877f2ab798da
+Subproject 35fa26ea1cefa2f76ddf77f8ad67f9021f37ee7
diff --git a/qtsystems b/qtsystems
-Subproject 1ad74a1dddcc3c46acac8381dc7ebc8836e80b9
+Subproject 3b2218dfe58b4399084a54becf1dc449a545aa6
diff --git a/qttools b/qttools
-Subproject 2bcefb502f9059e7109cb9bb831215360c0ce8e
+Subproject ed8a00522837f6d172c92d19f813d927fda328d
diff --git a/qttranslations b/qttranslations
-Subproject 090e46c777e040507cf595b0f8ae92b1e67cc92
+Subproject fe5328346320fbf4ab6b5bfbbac8c014583151b
diff --git a/qtxmlpatterns b/qtxmlpatterns
-Subproject 7137785c87497f8beb5bda20505466430c6b152
+Subproject e15d4c73762ca8b21acebe581c520bcd06a8d86