diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-11 12:39:23 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-11 12:39:23 +1000 |
| commit | e4a61858d9360fc522d9585ed69d9cb659188265 (patch) | |
| tree | d59fd77b0de12ea3e794352af51549f9d0f5ad27 | |
| parent | cf80e02cd307b77957cb5e154391dce91e184c0a (diff) | |
| parent | b984a0da2baa935ba9e39243c07160a68cfb682a (diff) | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
qtlocation: add to SUBDIRS, but do not (yet) compile it by default
| -rw-r--r-- | qt.pro | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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 \ |