aboutsummaryrefslogtreecommitdiffstats
path: root/qt.pro
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2011-05-11 09:05:46 +1000
committerRohan McGovern <rohan.mcgovern@nokia.com>2011-05-11 12:34:45 +1000
commitb984a0da2baa935ba9e39243c07160a68cfb682a (patch)
treed59fd77b0de12ea3e794352af51549f9d0f5ad27 /qt.pro
parent5bba019a81b5b5c5b9d080c68d036e3ebc489c19 (diff)
qtlocation: add to SUBDIRS, but do not (yet) compile it by default
The previous method of adding qtlocation did not allow `make module-qtlocation' to work. Reviewed-by: Alex Change-Id: I75caab75ddf8ed5800c75933097df297b0021c6c
Diffstat (limited to 'qt.pro')
-rw-r--r--qt.pro4
1 files changed, 3 insertions, 1 deletions
diff --git a/qt.pro b/qt.pro
index d2fb223d..f174aed1 100644
--- a/qt.pro
+++ b/qt.pro
@@ -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 \