diff options
author | Jonas Rabbe <jonas.rabbe@nokia.com> | 2011-07-05 14:18:51 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-06 05:17:52 +0200 |
commit | 503f885785d40de48a1d18d207b48552bbbdf4e5 (patch) | |
tree | 6adb2bd9e0361295b83566f8459f83afed2cfd38 /examples | |
parent | d13d75949f2582091fd07590716f01622233a250 (diff) |
Fixed up examples and demos
Changed the .pro files and moved some things around to ensure that the
examples and demos for Qt Multimedia Kit compiles and can be checked by
the CI system.
Change-Id: I915dc38ca76a97f20949df715725659c603231e2
Reviewed-on: http://codereview.qt.nokia.com/1136
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/audiodevices/audiodevices.pro | 17 | ||||
-rw-r--r-- | examples/audiodevices/main.cpp (renamed from examples/main.cpp) | 0 | ||||
-rw-r--r-- | examples/audioinput/audioinput.pro | 16 | ||||
-rw-r--r-- | examples/audiooutput/audiooutput.pro | 17 | ||||
-rw-r--r-- | examples/audiorecorder/audiorecorder.pro | 17 | ||||
-rw-r--r-- | examples/camera/camera.pro | 15 | ||||
-rw-r--r-- | examples/declarative-camera/declarative-camera.pro | 15 | ||||
-rw-r--r-- | examples/examples.pro | 4 | ||||
-rw-r--r-- | examples/radio/radio.pro | 17 | ||||
-rw-r--r-- | examples/slideshow/slideshow.pro | 12 | ||||
-rw-r--r-- | examples/videographicsitem/videographicsitem.pro | 17 | ||||
-rw-r--r-- | examples/videowidget/videowidget.pro | 16 |
12 files changed, 84 insertions, 79 deletions
diff --git a/examples/audiodevices/audiodevices.pro b/examples/audiodevices/audiodevices.pro index 2af690b8c..e7904f5a9 100644 --- a/examples/audiodevices/audiodevices.pro +++ b/examples/audiodevices/audiodevices.pro @@ -1,13 +1,7 @@ TEMPLATE = app -CONFIG += example +TARGET = audiodevices -INCLUDEPATH += ../../src/multimedia ../../src/multimedia/audio -include(../mobility_examples.pri) - -CONFIG += mobility -MOBILITY = multimedia - -QMAKE_RPATHDIR += $$DESTDIR +QT += multimediakit HEADERS = audiodevices.h @@ -19,3 +13,10 @@ FORMS += audiodevicesbase.ui symbian { TARGET.CAPABILITY = UserEnvironment WriteDeviceData ReadDeviceData } + +target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audiodevices +sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audiodevices + +INSTALLS += target sources + diff --git a/examples/main.cpp b/examples/audiodevices/main.cpp index 451be57b9..451be57b9 100644 --- a/examples/main.cpp +++ b/examples/audiodevices/main.cpp diff --git a/examples/audioinput/audioinput.pro b/examples/audioinput/audioinput.pro index 80daa8d65..6d2aa501d 100644 --- a/examples/audioinput/audioinput.pro +++ b/examples/audioinput/audioinput.pro @@ -1,16 +1,16 @@ TEMPLATE = app -CONFIG += example +TARGET = audioinput -INCLUDEPATH += ../../src/multimedia ../../src/multimedia/audio -include(../mobility_examples.pri) - -CONFIG += mobility -MOBILITY = multimedia - -QMAKE_RPATHDIR += $$DESTDIR +QT += multimediakit HEADERS = audioinput.h SOURCES = audioinput.cpp \ main.cpp +target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audioinput +sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audioinput + +INSTALLS += target sources + diff --git a/examples/audiooutput/audiooutput.pro b/examples/audiooutput/audiooutput.pro index 63d037f60..38159fa70 100644 --- a/examples/audiooutput/audiooutput.pro +++ b/examples/audiooutput/audiooutput.pro @@ -1,15 +1,16 @@ TEMPLATE = app -CONFIG += example +TARGET += audiooutput -INCLUDEPATH += ../../src/multimedia ../../src/multimedia/audio -include(../mobility_examples.pri) - -CONFIG += mobility -MOBILITY = multimedia - -QMAKE_RPATHDIR += $$DESTDIR +QT += multimediakit HEADERS = audiooutput.h SOURCES = audiooutput.cpp \ main.cpp + +target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audiooutput +sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audiooutput + +INSTALLS += target sources + diff --git a/examples/audiorecorder/audiorecorder.pro b/examples/audiorecorder/audiorecorder.pro index 99502414e..9b56a8cd2 100644 --- a/examples/audiorecorder/audiorecorder.pro +++ b/examples/audiorecorder/audiorecorder.pro @@ -1,13 +1,7 @@ TEMPLATE = app -CONFIG += example +TARGET = audiorecorder -INCLUDEPATH += ../../src/multimedia ../../src/multimedia/audio -include(../mobility_examples.pri) - -CONFIG += mobility -MOBILITY = multimedia - -QMAKE_RPATHDIR += $$DESTDIR +QT += multimediakit HEADERS = \ audiorecorder.h @@ -27,3 +21,10 @@ maemo*: { symbian: { TARGET.CAPABILITY = UserEnvironment ReadDeviceData WriteDeviceData } + +target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audiorecorder +sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audiorecorder + +INSTALLS += target sources + diff --git a/examples/camera/camera.pro b/examples/camera/camera.pro index 2d657e887..6ec82caf5 100644 --- a/examples/camera/camera.pro +++ b/examples/camera/camera.pro @@ -1,13 +1,7 @@ TEMPLATE = app TARGET = camera -INCLUDEPATH+=../../src/multimedia \ - ../../src/multimedia/video - -include(../mobility_examples.pri) - -CONFIG += mobility -MOBILITY = multimedia +QT += multimediakit HEADERS = \ camera.h \ @@ -31,3 +25,10 @@ symbian { TARGET.EPOCHEAPSIZE = 0x20000 0x3000000 LIBS += -lavkon -leiksrv -lcone -leikcore } + +target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/camera +sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/camera + +INSTALLS += target sources + diff --git a/examples/declarative-camera/declarative-camera.pro b/examples/declarative-camera/declarative-camera.pro index 297361cf3..d0db15776 100644 --- a/examples/declarative-camera/declarative-camera.pro +++ b/examples/declarative-camera/declarative-camera.pro @@ -1,8 +1,7 @@ -include (../mobility_examples.pri) TEMPLATE=app -QT += declarative network +QT += declarative network multimediakit !maemo5 { contains(QT_CONFIG, opengl) { @@ -10,12 +9,6 @@ QT += declarative network } } -win32 { - #required by Qt SDK to resolve Mobility libraries - CONFIG+=mobility - MOBILITY+=multimedia -} - SOURCES += $$PWD/qmlcamera.cpp !mac:TARGET = qml_camera else:TARGET = QmlCamera @@ -29,3 +22,9 @@ symbian { TARGET.EPOCHEAPSIZE = 0x20000 0x3000000 } +target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/qml_camera +sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/qml_camera + +INSTALLS += target sources + diff --git a/examples/examples.pro b/examples/examples.pro index fd0069732..522b1b561 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -15,7 +15,3 @@ contains(QT_CONFIG, declarative) { SUBDIRS += declarative-camera } -sources.path = $$QT_MOBILITY_EXAMPLES - -INSTALLS += sources - diff --git a/examples/radio/radio.pro b/examples/radio/radio.pro index 386efd4a5..b0b9ff3dc 100644 --- a/examples/radio/radio.pro +++ b/examples/radio/radio.pro @@ -1,13 +1,7 @@ TEMPLATE = app -CONFIG += example +TARGET = radio -INCLUDEPATH += ../../src/multimedia -include(../mobility_examples.pri) - -CONFIG += mobility -MOBILITY = multimedia - -QMAKE_RPATHDIR += $$DESTDIR +QT += multimediakit HEADERS = \ radio.h @@ -19,3 +13,10 @@ SOURCES = \ symbian: { TARGET.CAPABILITY = UserEnvironment WriteDeviceData ReadDeviceData SwEvent } + +target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/radio +sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/radio + +INSTALLS += target sources + diff --git a/examples/slideshow/slideshow.pro b/examples/slideshow/slideshow.pro index 76c660a16..e969ade66 100644 --- a/examples/slideshow/slideshow.pro +++ b/examples/slideshow/slideshow.pro @@ -1,10 +1,7 @@ TEMPLATE = app TARGET = slideshow -INCLUDEPATH+=../../src/multimedia -include (../mobility_examples.pri) -CONFIG += mobility -MOBILITY = multimedia +QT += multimediakit HEADERS = \ slideshow.h @@ -17,3 +14,10 @@ symbian { TARGET.CAPABILITY = NetworkServices TARGET.EPOCHEAPSIZE = 0x20000 0x3000000 } + +target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/slideshow +sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/slideshow + +INSTALLS += target sources + diff --git a/examples/videographicsitem/videographicsitem.pro b/examples/videographicsitem/videographicsitem.pro index 8461bebe6..4738dfa64 100644 --- a/examples/videographicsitem/videographicsitem.pro +++ b/examples/videographicsitem/videographicsitem.pro @@ -1,13 +1,7 @@ TEMPLATE = app -CONFIG += example +TARGET = videographicsitem -INCLUDEPATH += ../../src/multimedia ../../src/multimedia/video -include(../mobility_examples.pri) - -CONFIG += mobility -MOBILITY = multimedia - -QMAKE_RPATHDIR += $$DESTDIR +QT += multimediakit !symbian:contains(QT_CONFIG, opengl): QT += opengl @@ -17,3 +11,10 @@ HEADERS += videoplayer.h \ SOURCES += main.cpp \ videoplayer.cpp \ videoitem.cpp + +target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/videographicsitem +sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/videographicsitem + +INSTALLS += target sources + diff --git a/examples/videowidget/videowidget.pro b/examples/videowidget/videowidget.pro index 1ef79fcaa..40f2cc17a 100644 --- a/examples/videowidget/videowidget.pro +++ b/examples/videowidget/videowidget.pro @@ -1,13 +1,7 @@ TEMPLATE = app -CONFIG += example +TARGET = videowidget -INCLUDEPATH += ../../src/multimedia ../../src/multimedia/video -include(../mobility_examples.pri) - -CONFIG += mobility -MOBILITY = multimedia - -QMAKE_RPATHDIR += $$DESTDIR +QT += multimediakit HEADERS = \ videoplayer.h \ @@ -20,3 +14,9 @@ SOURCES = \ videowidget.cpp \ videowidgetsurface.cpp +target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/videowidget +sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/videowidget + +INSTALLS += target sources + |