lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-23 06:41:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging

Browse Source 
* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
  Clean up inconsistent usage of `depends' in qt.pro
  The qtlocation module depends on declarative too
This commit is contained in:
Qt Continuous Integration System
2011-05-19 08:54:29 +10:00
parent 0bd5d8134f 5360908e14
commit 04dd09b17f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
qt.pro
View File

@@ -59,15 +59,15 @@ module_qtactiveqt.depends = module_qtbase
module_qlalr.subdir = $$IN_PWD/qlalr
module_qlalr.target = module-qlalr
module_qlalr.depends = module-qtbase
module_qlalr.depends = module_qtbase
module_qtqa.subdir = $$IN_PWD/qtqa
module_qtqa.target = module-qtqa
module_qtqa.depends = module-qtbase
module_qtqa.depends = module_qtbase
module_qtlocation.subdir = $$IN_PWD/qtlocation
module_qtlocation.target = module-qtlocation
module_qtlocation.depends = module-qtbase
module_qtlocation.depends = module_qtbase module_qtdeclarative
# not yet enabled by default
module_qtlocation.CONFIG = no_default_target no_default_install