slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed up examples and demos

Browse Source 
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>
This commit is contained in:
Jonas Rabbe
2011-07-05 14:18:51 +10:00
committed by Qt by Nokia
parent d13d75949f
commit 503f885785
14 changed files with 98 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
demos/player/player.pro
View File

@@ -1,13 +1,11 @@
TEMPLATE = app TEMPLATE = app
TARGET = player TARGET = player
CONFIG += qt warn_on
QT += network \ QT += network \
xml xml \
multimediakit \
INCLUDEPATH += ../../src/multimedia ../../src/multimedia/audio
include(../demos.pri)
CONFIG += mobility
MOBILITY = multimedia
HEADERS = \ HEADERS = \
player.h \ player.h \
@@ -28,3 +26,10 @@ symbian {
LIBS += -lavkon -lcone -leikcore LIBS += -lavkon -lcone -leikcore
TARGET.CAPABILITY = ReadUserData TARGET.CAPABILITY = ReadUserData
} }
#install
target.path = $$[QT_INSTALL_DEMOS]/qtmultimediakit/player
sources.files = $$SOURCES $HEADERS $$RESOURCES $$FORMS *.pro
sources.path = $$[QT_INSTALL_DEMOS]/qtmultimediakit/player
INSTALLS += target sources

17
examples/audiodevices/audiodevices.pro
View File

@@ -1,13 +1,7 @@
TEMPLATE = app TEMPLATE = app
CONFIG += example TARGET = audiodevices
INCLUDEPATH += ../../src/multimedia ../../src/multimedia/audio QT += multimediakit
include(../mobility_examples.pri)
CONFIG += mobility
MOBILITY = multimedia
QMAKE_RPATHDIR += $$DESTDIR
HEADERS = audiodevices.h HEADERS = audiodevices.h
@@ -19,3 +13,10 @@ FORMS += audiodevicesbase.ui
symbian { symbian {
TARGET.CAPABILITY = UserEnvironment WriteDeviceData ReadDeviceData 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

0
examples/main.cpp → examples/audiodevices/main.cpp
View File

16
examples/audioinput/audioinput.pro
View File

@@ -1,16 +1,16 @@
TEMPLATE = app TEMPLATE = app
CONFIG += example TARGET = audioinput
INCLUDEPATH += ../../src/multimedia ../../src/multimedia/audio QT += multimediakit
include(../mobility_examples.pri)
CONFIG += mobility
MOBILITY = multimedia
QMAKE_RPATHDIR += $$DESTDIR
HEADERS = audioinput.h HEADERS = audioinput.h
SOURCES = audioinput.cpp \ SOURCES = audioinput.cpp \
main.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

17
examples/audiooutput/audiooutput.pro
View File

@@ -1,15 +1,16 @@
TEMPLATE = app TEMPLATE = app
CONFIG += example TARGET += audiooutput
INCLUDEPATH += ../../src/multimedia ../../src/multimedia/audio QT += multimediakit
include(../mobility_examples.pri)
CONFIG += mobility
MOBILITY = multimedia
QMAKE_RPATHDIR += $$DESTDIR
HEADERS = audiooutput.h HEADERS = audiooutput.h
SOURCES = audiooutput.cpp \ SOURCES = audiooutput.cpp \
main.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

17
examples/audiorecorder/audiorecorder.pro
View File

@@ -1,13 +1,7 @@
TEMPLATE = app TEMPLATE = app
CONFIG += example TARGET = audiorecorder
INCLUDEPATH += ../../src/multimedia ../../src/multimedia/audio QT += multimediakit
include(../mobility_examples.pri)
CONFIG += mobility
MOBILITY = multimedia
QMAKE_RPATHDIR += $$DESTDIR
HEADERS = \ HEADERS = \
audiorecorder.h audiorecorder.h
@@ -27,3 +21,10 @@ maemo*: {
symbian: { symbian: {
TARGET.CAPABILITY = UserEnvironment ReadDeviceData WriteDeviceData 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

15
examples/camera/camera.pro
View File

@@ -1,13 +1,7 @@
TEMPLATE = app TEMPLATE = app
TARGET = camera TARGET = camera
INCLUDEPATH+=../../src/multimedia \ QT += multimediakit
../../src/multimedia/video
include(../mobility_examples.pri)
CONFIG += mobility
MOBILITY = multimedia
HEADERS = \ HEADERS = \
camera.h \ camera.h \
@@ -31,3 +25,10 @@ symbian {
TARGET.EPOCHEAPSIZE = 0x20000 0x3000000 TARGET.EPOCHEAPSIZE = 0x20000 0x3000000
LIBS += -lavkon -leiksrv -lcone -leikcore 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

15
examples/declarative-camera/declarative-camera.pro
View File

@@ -1,8 +1,7 @@
include (../mobility_examples.pri)
TEMPLATE=app TEMPLATE=app
QT += declarative network QT += declarative network multimediakit
!maemo5 { !maemo5 {
contains(QT_CONFIG, opengl) { 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 SOURCES += $$PWD/qmlcamera.cpp
!mac:TARGET = qml_camera !mac:TARGET = qml_camera
else:TARGET = QmlCamera else:TARGET = QmlCamera
@@ -29,3 +22,9 @@ symbian {
TARGET.EPOCHEAPSIZE = 0x20000 0x3000000 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

4
examples/examples.pro
View File

@@ -15,7 +15,3 @@ contains(QT_CONFIG, declarative) {
SUBDIRS += declarative-camera SUBDIRS += declarative-camera
} }
sources.path = $$QT_MOBILITY_EXAMPLES
INSTALLS += sources

17
examples/radio/radio.pro
View File

@@ -1,13 +1,7 @@
TEMPLATE = app TEMPLATE = app
CONFIG += example TARGET = radio
INCLUDEPATH += ../../src/multimedia QT += multimediakit
include(../mobility_examples.pri)
CONFIG += mobility
MOBILITY = multimedia
QMAKE_RPATHDIR += $$DESTDIR
HEADERS = \ HEADERS = \
radio.h radio.h
@@ -19,3 +13,10 @@ SOURCES = \
symbian: { symbian: {
TARGET.CAPABILITY = UserEnvironment WriteDeviceData ReadDeviceData SwEvent 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

12
examples/slideshow/slideshow.pro
View File

@@ -1,10 +1,7 @@
TEMPLATE = app TEMPLATE = app
TARGET = slideshow TARGET = slideshow
INCLUDEPATH+=../../src/multimedia
include (../mobility_examples.pri)
CONFIG += mobility QT += multimediakit
MOBILITY = multimedia
HEADERS = \ HEADERS = \
slideshow.h slideshow.h
@@ -17,3 +14,10 @@ symbian {
TARGET.CAPABILITY = NetworkServices TARGET.CAPABILITY = NetworkServices
TARGET.EPOCHEAPSIZE = 0x20000 0x3000000 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

17
examples/videographicsitem/videographicsitem.pro
View File

@@ -1,13 +1,7 @@
TEMPLATE = app TEMPLATE = app
CONFIG += example TARGET = videographicsitem
INCLUDEPATH += ../../src/multimedia ../../src/multimedia/video QT += multimediakit
include(../mobility_examples.pri)
CONFIG += mobility
MOBILITY = multimedia
QMAKE_RPATHDIR += $$DESTDIR
!symbian:contains(QT_CONFIG, opengl): QT += opengl !symbian:contains(QT_CONFIG, opengl): QT += opengl
@@ -17,3 +11,10 @@ HEADERS += videoplayer.h \
SOURCES += main.cpp \ SOURCES += main.cpp \
videoplayer.cpp \ videoplayer.cpp \
videoitem.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

16
examples/videowidget/videowidget.pro
View File

@@ -1,13 +1,7 @@
TEMPLATE = app TEMPLATE = app
CONFIG += example TARGET = videowidget
INCLUDEPATH += ../../src/multimedia ../../src/multimedia/video QT += multimediakit
include(../mobility_examples.pri)
CONFIG += mobility
MOBILITY = multimedia
QMAKE_RPATHDIR += $$DESTDIR
HEADERS = \ HEADERS = \
videoplayer.h \ videoplayer.h \
@@ -20,3 +14,9 @@ SOURCES = \
videowidget.cpp \ videowidget.cpp \
videowidgetsurface.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

5
qtmultimediakit.pro
View File

@@ -23,8 +23,7 @@ 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 \
# temporarily disable demos and examples module_qtmultimediakit_demos \
# module_qtmultimediakit_demos \ module_qtmultimediakit_examples \
# module_qtmultimediakit_examples \
module_qtmultimediakit_tests \ module_qtmultimediakit_tests \