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>

30 files changed, 15 insertions, 24 deletions

diff --git a/demos/demos.pro b/demos/demos.pro
deleted file mode 100644
index 8cff09b3..00000000
--- a/demos/demos.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS += mapsdemo
diff --git a/examples/declarative/flickr/flickr.pro b/examples/declarative/flickr/flickr.pro
index adcc0a5a..85401ca2 100644
--- a/examples/declarative/flickr/flickr.pro
+++ b/examples/declarative/flickr/flickr.pro
@@ -12,8 +12,8 @@ symbian {
 RESOURCES += \
     flickr.qrc
 
-target.path = $$[QT_INSTALL_DEMOS]/qtlocation/declarative/flickr
+target.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/declarative/flickr
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.qml flickrcommon flickrmobile
-sources.path = $$[QT_INSTALL_DEMOS]/qtlocation/declarative/flickr
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/declarative/flickr
 
 INSTALLS += target sources
diff --git a/examples/declarative/landmarkmap/landmarkmap.pro b/examples/declarative/landmarkmap/landmarkmap.pro
index de018240..623658a3 100644
--- a/examples/declarative/landmarkmap/landmarkmap.pro
+++ b/examples/declarative/landmarkmap/landmarkmap.pro
@@ -15,10 +15,10 @@ RESOURCES += \
     landmarkmap.qrc
 
 install_files.files += nmealog.txt mylm.lmx landmarkmapcommon landmarkmapmobile landmarkmap.qml
-install_files.path = $$[QT_INSTALL_DEMOS]/qtlocation/declarative/landmark
+install_files.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/declarative/landmark
 
-target.path = $$[QT_INSTALL_DEMOS]/qtlocation/declarative/landmark
+target.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/declarative/landmark
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
-sources.path = $$[QT_INSTALL_DEMOS]/qtlocation/declarative/landmark
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/declarative/landmark
 
 INSTALLS += target sources install_files
diff --git a/examples/declarative/mapviewer/mapviewer.pro b/examples/declarative/mapviewer/mapviewer.pro
index 5a787021..ac651716 100644
--- a/examples/declarative/mapviewer/mapviewer.pro
+++ b/examples/declarative/mapviewer/mapviewer.pro
@@ -12,8 +12,8 @@ symbian {
 RESOURCES += \
     mapviewer.qrc
 
-target.path = $$[QT_INSTALL_DEMOS]/qtlocation/declarative/mapviewer
+target.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/declarative/mapviewer
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.qml *.png *.sci
-sources.path = $$[QT_INSTALL_DEMOS]/qtlocation/declarative/mapviewer
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/declarative/mapviewer
 
 INSTALLS += target sources
diff --git a/examples/examples.pro b/examples/examples.pro
index 03c4a217..1161e17a 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,2 +1,3 @@
 TEMPLATE = subdirs
-SUBDIRS += declarative
+SUBDIRS += declarative \
+           maps
diff --git a/demos/mapsdemo/icons/endmarker.png b/examples/maps/icons/endmarker.png
index 5701d916..5701d916 100644
--- a/demos/mapsdemo/icons/endmarker.png
+++ b/examples/maps/icons/endmarker.png
diff --git a/demos/mapsdemo/icons/mylocation.png b/examples/maps/icons/mylocation.png
index 877adbb1..877adbb1 100644
--- a/demos/mapsdemo/icons/mylocation.png
+++ b/examples/maps/icons/mylocation.png
diff --git a/demos/mapsdemo/icons/pathmarker.png b/examples/maps/icons/pathmarker.png
index ae046384..ae046384 100644
--- a/demos/mapsdemo/icons/pathmarker.png
+++ b/examples/maps/icons/pathmarker.png
diff --git a/demos/mapsdemo/icons/searchmarker.png b/examples/maps/icons/searchmarker.png
index 4c3c4d84..4c3c4d84 100644
--- a/demos/mapsdemo/icons/searchmarker.png
+++ b/examples/maps/icons/searchmarker.png
diff --git a/demos/mapsdemo/icons/startmarker.png b/examples/maps/icons/startmarker.png
index d188161e..d188161e 100644
--- a/demos/mapsdemo/icons/startmarker.png
+++ b/examples/maps/icons/startmarker.png
diff --git a/demos/mapsdemo/icons/waypointmarker.png b/examples/maps/icons/waypointmarker.png
index 6dd1acfa..6dd1acfa 100644
--- a/demos/mapsdemo/icons/waypointmarker.png
+++ b/examples/maps/icons/waypointmarker.png
diff --git a/demos/mapsdemo/main.cpp b/examples/maps/main.cpp
index 44a166f4..44a166f4 100644
--- a/demos/mapsdemo/main.cpp
+++ b/examples/maps/main.cpp
diff --git a/demos/mapsdemo/mainwindow.cpp b/examples/maps/mainwindow.cpp
index 4ffd6930..4ffd6930 100644
--- a/demos/mapsdemo/mainwindow.cpp
+++ b/examples/maps/mainwindow.cpp
diff --git a/demos/mapsdemo/mainwindow.h b/examples/maps/mainwindow.h
index d1480757..d1480757 100644
--- a/demos/mapsdemo/mainwindow.h
+++ b/examples/maps/mainwindow.h
diff --git a/demos/mapsdemo/mapsdemo.pro b/examples/maps/maps.pro
index 9c2bb26b..46e8665b 100644
--- a/demos/mapsdemo/mapsdemo.pro
+++ b/examples/maps/maps.pro
@@ -1,12 +1,12 @@
 TEMPLATE = app
-TARGET = mapsdemo
+TARGET = maps
 
 CONFIG += qt warn_on
 
 QT += network location
 
 
-RESOURCES += mapsdemo.qrc
+RESOURCES += maps.qrc
 
 symbian: {
     TARGET.CAPABILITY = Location \
@@ -35,7 +35,7 @@ SOURCES += \
     navigator.cpp
 
 #install
-target.path = $$[QT_INSTALL_DEMOS]/qtlocation/mapsdemo
+target.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/maps
 sources.files = $$SOURCES $HEADERS $$RESOURCES $$FORMS *.pro
-sources.path = $$[QT_INSTALL_DEMOS]/qtlocation/mapsdemo
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/maps
 INSTALLS += target sources
diff --git a/demos/mapsdemo/mapsdemo.qrc b/examples/maps/maps.qrc
index a46ea7db..a46ea7db 100644
--- a/demos/mapsdemo/mapsdemo.qrc
+++ b/examples/maps/maps.qrc
diff --git a/demos/mapsdemo/mapswidget.cpp b/examples/maps/mapswidget.cpp
index cf8fad12..cf8fad12 100644
--- a/demos/mapsdemo/mapswidget.cpp
+++ b/examples/maps/mapswidget.cpp
diff --git a/demos/mapsdemo/mapswidget.h b/examples/maps/mapswidget.h
index 07ef4d89..07ef4d89 100644
--- a/demos/mapsdemo/mapswidget.h
+++ b/examples/maps/mapswidget.h
diff --git a/demos/mapsdemo/marker.cpp b/examples/maps/marker.cpp
index 1c99958b..1c99958b 100644
--- a/demos/mapsdemo/marker.cpp
+++ b/examples/maps/marker.cpp
diff --git a/demos/mapsdemo/marker.h b/examples/maps/marker.h
index c6ae4e00..c6ae4e00 100644
--- a/demos/mapsdemo/marker.h
+++ b/examples/maps/marker.h
diff --git a/demos/mapsdemo/markerdialog.cpp b/examples/maps/markerdialog.cpp
index e9464332..e9464332 100644
--- a/demos/mapsdemo/markerdialog.cpp
+++ b/examples/maps/markerdialog.cpp
diff --git a/demos/mapsdemo/markerdialog.h b/examples/maps/markerdialog.h
index 7f083f32..7f083f32 100644
--- a/demos/mapsdemo/markerdialog.h
+++ b/examples/maps/markerdialog.h
diff --git a/demos/mapsdemo/navigatedialog.cpp b/examples/maps/navigatedialog.cpp
index d9184f36..d9184f36 100644
--- a/demos/mapsdemo/navigatedialog.cpp
+++ b/examples/maps/navigatedialog.cpp
diff --git a/demos/mapsdemo/navigatedialog.h b/examples/maps/navigatedialog.h
index 443f7801..443f7801 100644
--- a/demos/mapsdemo/navigatedialog.h
+++ b/examples/maps/navigatedialog.h
diff --git a/demos/mapsdemo/navigator.cpp b/examples/maps/navigator.cpp
index d255c74f..d255c74f 100644
--- a/demos/mapsdemo/navigator.cpp
+++ b/examples/maps/navigator.cpp
diff --git a/demos/mapsdemo/navigator.h b/examples/maps/navigator.h
index b48e6c25..b48e6c25 100644
--- a/demos/mapsdemo/navigator.h
+++ b/examples/maps/navigator.h
diff --git a/demos/mapsdemo/searchdialog.cpp b/examples/maps/searchdialog.cpp
index d8f50168..d8f50168 100644
--- a/demos/mapsdemo/searchdialog.cpp
+++ b/examples/maps/searchdialog.cpp
diff --git a/demos/mapsdemo/searchdialog.h b/examples/maps/searchdialog.h
index 39bce7a4..39bce7a4 100644
--- a/demos/mapsdemo/searchdialog.h
+++ b/examples/maps/searchdialog.h
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 \
diff --git a/tests/systemtests/sys_location.qtt b/tests/systemtests/sys_location.qtt
index d078a675..93c99fa4 100644
--- a/tests/systemtests/sys_location.qtt
+++ b/tests/systemtests/sys_location.qtt
@@ -59,7 +59,7 @@ testcase = {
         prompt(twiki('---+++ Position changes are detected
         Note that GPS and internet connection is required for this test case.
     | *Step* | *Verification* |
-    | Run the lightmaps_with_location app (sources are in demos/lightmaps). | Verify that map is displayed and centered with the current position |
+    | Run the lightmaps_with_location app (sources are in qtbase/examples/embedded/lightmaps). | Verify that map is displayed and centered with the current position |
     | Move to a different location | Verify that map is updated and centered with new location |'
        ));
     },