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>
This commit is contained in:
Jonas Rabbe
2011-07-12 13:22:06 +10:00
committed by Qt by Nokia
parent e55d67301d
commit 98729e41f8
14 changed files with 4 additions and 28 deletions

View File

@@ -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

View File

@@ -1,7 +0,0 @@
TEMPLATE = subdirs
SUBDIRS += \
player
sources.path = $$QT_MOBILITY_DEMOS
INSTALLS += sources

View File

@@ -9,7 +9,8 @@ SUBDIRS += \
audioinput \ audioinput \
audiooutput \ audiooutput \
videographicsitem \ videographicsitem \
videowidget videowidget \
player \
contains(QT_CONFIG, declarative) { contains(QT_CONFIG, declarative) {
SUBDIRS += declarative-camera SUBDIRS += declarative-camera

View File

@@ -28,8 +28,8 @@ symbian {
} }
#install #install
target.path = $$[QT_INSTALL_DEMOS]/qtmultimediakit/player target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/player
sources.files = $$SOURCES $HEADERS $$RESOURCES $$FORMS *.pro sources.files = $$SOURCES $HEADERS $$RESOURCES $$FORMS *.pro
sources.path = $$[QT_INSTALL_DEMOS]/qtmultimediakit/player sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/player
INSTALLS += target sources INSTALLS += target sources

View File

@@ -3,13 +3,6 @@ TEMPLATE = subdirs
module_qtmultimediakit_src.subdir = src module_qtmultimediakit_src.subdir = src
module_qtmultimediakit_src.target = module-qtmultimediakit-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.subdir = examples
module_qtmultimediakit_examples.target = module-qtmultimediakit-examples module_qtmultimediakit_examples.target = module-qtmultimediakit-examples
module_qtmultimediakit_examples.depends = module_qtmultimediakit_src 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 module_qtmultimediakit_tests.CONFIG = no_default_target no_default_install
SUBDIRS += module_qtmultimediakit_src \ SUBDIRS += module_qtmultimediakit_src \
module_qtmultimediakit_demos \
module_qtmultimediakit_examples \ module_qtmultimediakit_examples \
module_qtmultimediakit_tests \ module_qtmultimediakit_tests \