diff options
| -rw-r--r-- | demos/demos.pri | 10 | ||||
| -rw-r--r-- | demos/demos.pro | 7 | ||||
| -rw-r--r-- | examples/examples.pro | 3 | ||||
| -rw-r--r-- | examples/player/main.cpp (renamed from demos/player/main.cpp) | 0 | ||||
| -rw-r--r-- | examples/player/player.cpp (renamed from demos/player/player.cpp) | 0 | ||||
| -rw-r--r-- | examples/player/player.h (renamed from demos/player/player.h) | 0 | ||||
| -rw-r--r-- | examples/player/player.pro (renamed from demos/player/player.pro) | 4 | ||||
| -rw-r--r-- | examples/player/playercontrols.cpp (renamed from demos/player/playercontrols.cpp) | 0 | ||||
| -rw-r--r-- | examples/player/playercontrols.h (renamed from demos/player/playercontrols.h) | 0 | ||||
| -rw-r--r-- | examples/player/playlistmodel.cpp (renamed from demos/player/playlistmodel.cpp) | 0 | ||||
| -rw-r--r-- | examples/player/playlistmodel.h (renamed from demos/player/playlistmodel.h) | 0 | ||||
| -rw-r--r-- | examples/player/videowidget.cpp (renamed from demos/player/videowidget.cpp) | 0 | ||||
| -rw-r--r-- | examples/player/videowidget.h (renamed from demos/player/videowidget.h) | 0 | ||||
| -rw-r--r-- | qtmultimediakit.pro | 8 |
14 files changed, 4 insertions, 28 deletions
diff --git a/demos/demos.pri b/demos/demos.pri deleted file mode 100644 index 48c8bf2fc..000000000 --- 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 index 22d06f518..000000000 --- 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 522b1b561..8135f56a5 100644 --- 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 index 403a085f0..403a085f0 100644 --- a/demos/player/main.cpp +++ b/examples/player/main.cpp diff --git a/demos/player/player.cpp b/examples/player/player.cpp index 8fa387916..8fa387916 100644 --- a/demos/player/player.cpp +++ b/examples/player/player.cpp diff --git a/demos/player/player.h b/examples/player/player.h index e5c075ebe..e5c075ebe 100644 --- a/demos/player/player.h +++ b/examples/player/player.h diff --git a/demos/player/player.pro b/examples/player/player.pro index 332a84c31..c22066dc2 100644 --- 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 index bf4d96b2f..bf4d96b2f 100644 --- a/demos/player/playercontrols.cpp +++ b/examples/player/playercontrols.cpp diff --git a/demos/player/playercontrols.h b/examples/player/playercontrols.h index 89dc3fd9e..89dc3fd9e 100644 --- a/demos/player/playercontrols.h +++ b/examples/player/playercontrols.h diff --git a/demos/player/playlistmodel.cpp b/examples/player/playlistmodel.cpp index 21bc4ccf4..21bc4ccf4 100644 --- a/demos/player/playlistmodel.cpp +++ b/examples/player/playlistmodel.cpp diff --git a/demos/player/playlistmodel.h b/examples/player/playlistmodel.h index cf580d8f5..cf580d8f5 100644 --- a/demos/player/playlistmodel.h +++ b/examples/player/playlistmodel.h diff --git a/demos/player/videowidget.cpp b/examples/player/videowidget.cpp index 46f1b33ff..46f1b33ff 100644 --- a/demos/player/videowidget.cpp +++ b/examples/player/videowidget.cpp diff --git a/demos/player/videowidget.h b/examples/player/videowidget.h index 5d382f981..5d382f981 100644 --- a/demos/player/videowidget.h +++ b/examples/player/videowidget.h diff --git a/qtmultimediakit.pro b/qtmultimediakit.pro index 38de93443..54eb4058a 100644 --- 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 \ |