diff options
| author | Casper van Donderen <casper.vandonderen@nokia.com> | 2011-07-05 10:53:55 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-11 09:02:44 +0200 |
| commit | 47db4be971b687c74d40b798c400c8ca99147aed (patch) | |
| tree | e48c5bcb3459cbe686480665c4b251ba9e653fec /qtlocation.pro | |
| parent | 25a0d727c12b3c38af450e532ee8510748058bc1 (diff) | |
| download | qtlocation-47db4be971b687c74d40b798c400c8ca99147aed.tar.gz | |
Merge demos and examples.
We are merging the Qt demos and examples. That means that references to
QT_INSTALL_DEMOS should be removed and that the things previously called
demos should now be in the examples folder.
Change-Id: I5245611428bdd28c884b3f620be96fd970fdbfd0
Reviewed-on: http://codereview.qt.nokia.com/1276
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
Diffstat (limited to 'qtlocation.pro')
| -rw-r--r-- | qtlocation.pro | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/qtlocation.pro b/qtlocation.pro index 95a619f2..a973bac1 100644 --- a/qtlocation.pro +++ b/qtlocation.pro @@ -3,14 +3,7 @@ TEMPLATE = subdirs module_qtlocation_src.subdir = src module_qtlocation_src.target = module-qtlocation-src -module_qtlocation_demos.subdir = demos -module_qtlocation_demos.target = module-qtlocation-demos -module_qtlocation_demos.depends = module_qtlocation_src -!contains(QT_BUILD_PARTS,demos) { - module_qtlocation_demos.CONFIG += no_default_install no_default_target -} - -module_qtlocation_examples.subdir = examples/declarative +module_qtlocation_examples.subdir = examples module_qtlocation_examples.target = module-qtlocation-examples module_qtlocation_examples.depends = module_qtlocation_src !contains(QT_BUILD_PARTS,examples) { @@ -26,6 +19,5 @@ module_qtlocation_tests.depends = module_qtlocation_src SUBDIRS += module_qtlocation_src \ - module_qtlocation_demos \ module_qtlocation_examples \ module_qtlocation_tests \ |