Moved demo(s) to examples.

Demos are no longer part of QT_BUILD_PARTS, so any demos must be moved
to examples to be build. So far that means the player demo.

Change-Id: I92641be38accb1c1b723009f1004c63f59ec8266
Reviewed-on: http://codereview.qt.nokia.com/1470
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

diff --git a/demos/demos.pri b/demos/demos.pri
deleted file mode 100644 (file)
index 48c8bf2..0000000
--- a/demos/demos.pri
+++ /dev/null
@@ -1,10 +0,0 @@
-include(../features/basic_examples_setup.pri)
-
-!plugin {
-    target.path=$$QT_MOBILITY_DEMOS
-} else {
-    target.path = $${QT_MOBILITY_PLUGINS}/$${PLUGIN_TYPE}
-}
-INSTALLS += target
-
-

diff --git a/demos/demos.pro b/demos/demos.pro
deleted file mode 100644 (file)
index 22d06f5..0000000
--- a/demos/demos.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS += \
-    player
-
-sources.path = $$QT_MOBILITY_DEMOS
-INSTALLS += sources

diff --git a/examples/examples.pro b/examples/examples.pro
index 522b1b5..8135f56 100644 (file)
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -9,7 +9,8 @@ SUBDIRS += \
     audioinput \
     audiooutput \
     videographicsitem \
-    videowidget
+    videowidget \
+    player \
 
 contains(QT_CONFIG, declarative) {
     SUBDIRS += declarative-camera

diff --git a/demos/player/main.cpp b/examples/player/main.cpp
similarity index 100%
rename from demos/player/main.cpp
rename to examples/player/main.cpp

diff --git a/demos/player/player.cpp b/examples/player/player.cpp
similarity index 100%
rename from demos/player/player.cpp
rename to examples/player/player.cpp

diff --git a/demos/player/player.h b/examples/player/player.h
similarity index 100%
rename from demos/player/player.h
rename to examples/player/player.h

diff --git a/demos/player/player.pro b/examples/player/player.pro
similarity index 81%
rename from demos/player/player.pro
rename to examples/player/player.pro
index 332a84c..c22066d 100644 (file)
--- a/demos/player/player.pro
+++ b/examples/player/player.pro
@@ -28,8 +28,8 @@ symbian {
 }
 
 #install
-target.path = $$[QT_INSTALL_DEMOS]/qtmultimediakit/player
+target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/player
 sources.files = $$SOURCES $HEADERS $$RESOURCES $$FORMS *.pro
-sources.path = $$[QT_INSTALL_DEMOS]/qtmultimediakit/player
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/player
 INSTALLS += target sources
 

diff --git a/demos/player/playercontrols.cpp b/examples/player/playercontrols.cpp
similarity index 100%
rename from demos/player/playercontrols.cpp
rename to examples/player/playercontrols.cpp

diff --git a/demos/player/playercontrols.h b/examples/player/playercontrols.h
similarity index 100%
rename from demos/player/playercontrols.h
rename to examples/player/playercontrols.h

diff --git a/demos/player/playlistmodel.cpp b/examples/player/playlistmodel.cpp
similarity index 100%
rename from demos/player/playlistmodel.cpp
rename to examples/player/playlistmodel.cpp

diff --git a/demos/player/playlistmodel.h b/examples/player/playlistmodel.h
similarity index 100%
rename from demos/player/playlistmodel.h
rename to examples/player/playlistmodel.h

diff --git a/demos/player/videowidget.cpp b/examples/player/videowidget.cpp
similarity index 100%
rename from demos/player/videowidget.cpp
rename to examples/player/videowidget.cpp

diff --git a/demos/player/videowidget.h b/examples/player/videowidget.h
similarity index 100%
rename from demos/player/videowidget.h
rename to examples/player/videowidget.h

diff --git a/qtmultimediakit.pro b/qtmultimediakit.pro
index 38de934..54eb405 100644 (file)
--- a/qtmultimediakit.pro
+++ b/qtmultimediakit.pro
@@ -3,13 +3,6 @@ TEMPLATE = subdirs
 module_qtmultimediakit_src.subdir = src
 module_qtmultimediakit_src.target = module-qtmultimediakit-src
 
-module_qtmultimediakit_demos.subdir = demos
-module_qtmultimediakit_demos.target = module-qtmultimediakit-demos
-module_qtmultimediakit_demos.depends = module_qtmultimediakit_src
-!contains(QT_BUILD_PARTS,demos) {
-    module_qtmultimediakit_demos.CONFIG = no_default_target no_default_install
-}
-
 module_qtmultimediakit_examples.subdir = examples
 module_qtmultimediakit_examples.target = module-qtmultimediakit-examples
 module_qtmultimediakit_examples.depends = module_qtmultimediakit_src
@@ -23,7 +16,6 @@ module_qtmultimediakit_tests.depends = module_qtmultimediakit_src
 module_qtmultimediakit_tests.CONFIG = no_default_target no_default_install
 
 SUBDIRS += module_qtmultimediakit_src \
-           module_qtmultimediakit_demos \
            module_qtmultimediakit_examples \
            module_qtmultimediakit_tests \