summaryrefslogtreecommitdiffstats
path: root/qt.pro
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2011-09-19 08:57:00 +1000
committerQt by Nokia <qt-info@nokia.com>2011-09-22 05:28:19 +0200
commitddf85c473b71cdc7d3339dde46222f253929dabe (patch)
tree10db308e9d994b4d3979a8d5fdf7fb43b6530c16 /qt.pro
parenta7b8fd44f952c8b9141a08f34ef74bec4f11dc5a (diff)
Updated submodules (merged refactor)
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>
Diffstat (limited to 'qt.pro')
-rw-r--r--qt.pro6
1 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