summaryrefslogtreecommitdiffstats
path: root/src/multimedia/multimedia.pro
diff options
context:
space:
mode:
Diffstat (limited to 'src/multimedia/multimedia.pro')
-rw-r--r--src/multimedia/multimedia.pro18
1 files changed, 14 insertions, 4 deletions
diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro
index a6868d31e0..ecd83d4e62 100644
--- a/src/multimedia/multimedia.pro
+++ b/src/multimedia/multimedia.pro
@@ -1,3 +1,5 @@
+include(../../features/utils.pri)
+
TEMPLATE = lib
# distinct from QtMultimedia
@@ -8,7 +10,7 @@ INCLUDEPATH+= .
QT += network
-contains(QT_CONFIG, opengl) | contains(QT_CONFIG, opengles2): !symbian {
+contains(QT_CONFIG, opengl) | contains(QT_CONFIG, opengles2) {
QT += opengl
} else {
DEFINES += QT_NO_OPENGL
@@ -189,10 +191,18 @@ maemo6 {
symbian {
contains(surfaces_s60_enabled, yes) {
- SOURCES += qgraphicsvideoitem_symbian.cpp
+ SOURCES += qeglimagevideosurface_symbian.cpp \
+ qgraphicsvideoitem_symbian.cpp
+ HEADERS += qeglimagevideosurface_symbian_p.h
} else {
SOURCES += qgraphicsvideoitem_overlay.cpp
}
+ contains(QT_CONFIG, egl): LIBS *= -llibegl
+ contains(QT_CONFIG, openvg) {
+ LIBS += -llibopenvg
+ } else {
+ DEFINES += QT_NO_OPENVG
+ }
}
!maemo*:!symbian {
@@ -204,10 +214,10 @@ HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
symbian {
contains(S60_VERSION, 5.1) |contains (S60_VERSION, 3.2) | contains(S60_VERSION, 3.1): DEFINES += PRE_S60_52_PLATFORM
load(data_caging_paths)
- QtMediaDeployment.sources = QtMultimediaKit.dll
+ QtMediaDeployment.sources = QtMultimediaKit$${QT_LIBINFIX}.dll
QtMediaDeployment.path = /sys/bin
DEPLOYMENT += QtMediaDeployment
- TARGET.UID3=0x2002AC77
+ TARGET.UID3 = $$mobilityUID(0x2002AC77)
TARGET.CAPABILITY = ALL -TCB
LIBS += -lefsrv
}