From 47db4be971b687c74d40b798c400c8ca99147aed Mon Sep 17 00:00:00 2001 From: Casper van Donderen Date: Tue, 5 Jul 2011 10:53:55 +0200 Subject: 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 Reviewed-by: Aaron McCarthy --- qtlocation.pro | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'qtlocation.pro') 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 \ -- cgit v1.2.3