lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +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:
  qtlocation: add to SUBDIRS, but do not (yet) compile it by default
This commit is contained in:
Qt Continuous Integration System
2011-05-11 12:39:23 +10:00
parent cf80e02cd3 b984a0da2b
commit e4a61858d9
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
qt.pro
View File

@@ -65,10 +65,11 @@ module_qtqa.subdir = $$IN_PWD/qtqa
module_qtqa.target = module-qtqa
module_qtqa.depends = module-qtbase
# not yet enabled via SUBDIRS
module_qtlocation.subdir = $$IN_PWD/qtlocation
module_qtlocation.target = module-qtlocation
module_qtlocation.depends = module-qtbase
# not yet enabled by default
module_qtlocation.CONFIG = no_default_target no_default_install
SUBDIRS = \
module_qtbase \
@@ -83,6 +84,7 @@ SUBDIRS = \
module_qtdoc \
module_qlalr \
module_qtqa \
module_qtlocation \
exists(qtwebkit/Tools/Scripts/build-webkit) {
SUBDIRS += module_qtwebkit \