lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-21 04:16:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Updated submodules (merged refactor)

Browse Source 
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>
This commit is contained in:
Rohan McGovern
2011-09-19 08:57:00 +10:00
committed by Qt by Nokia
parent a7b8fd44f9
commit ddf85c473b
20 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
qt.pro
View File

@@ -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