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

adjust to qt_plugin.prf changes

Browse Source 
DESTDIR and INSTALLS+=target are set up automatically now. note that in
the qmediaserviceprovider test we must override that.
also, TARGET munging is done automatically.

Change-Id: Ida5d5601e22b099134d1ec07ace713e0d0986bd6
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Oswald Buddenhagen
2012-10-24 15:33:02 +02:00
committed by The Qt Project
parent 9dbcbc0b2f
commit 0affd9023f
18 changed files with 28 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/gstreamer/audiodecoder/audiodecoder.pro
View File

@@ -1,8 +1,7 @@
TARGET = gstaudiodecoder
PLUGIN_TYPE = mediaservice
PLUGIN_TYPE = mediaservice
load(qt_plugin)
DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE}
include(../common.pri)
@@ -20,9 +19,6 @@ SOURCES += \
$$PWD/qgstreameraudiodecodersession.cpp \
$$PWD/qgstreameraudiodecoderserviceplugin.cpp
target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
INSTALLS += target
OTHER_FILES += \
audiodecoder.json

8
src/plugins/gstreamer/camerabin/camerabin.pro
View File

@@ -1,10 +1,9 @@
TARGET = gstcamerabin
PLUGIN_TYPE = mediaservice
QT += multimedia-private
PLUGIN_TYPE = mediaservice
load(qt_plugin)
DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE}
include(../common.pri)
@@ -77,11 +76,6 @@ have_gst_photography {
DEFINES += GST_USE_UNSTABLE_API #prevents warnings because of unstable photography API
}
target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
INSTALLS += target
OTHER_FILES += \
camerabin.json

6
src/plugins/gstreamer/mediacapture/mediacapture.pro
View File

@@ -1,8 +1,7 @@
TARGET = gstmediacapture
PLUGIN_TYPE = mediaservice
PLUGIN_TYPE = mediaservice
load(qt_plugin)
DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE}
include(../common.pri)
@@ -34,9 +33,6 @@ SOURCES += $$PWD/qgstreamercaptureservice.cpp \
$$PWD/qgstreamerimageencode.cpp \
$$PWD/qgstreamercaptureserviceplugin.cpp
target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
INSTALLS += target
# Camera usage with gstreamer needs to have
#CONFIG += use_gstreamer_camera

6
src/plugins/gstreamer/mediaplayer/mediaplayer.pro
View File

@@ -1,8 +1,7 @@
TARGET = gstmediaplayer
PLUGIN_TYPE = mediaservice
PLUGIN_TYPE = mediaservice
load(qt_plugin)
DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE}
include(../common.pri)
@@ -26,9 +25,6 @@ SOURCES += \
$$PWD/qgstreameravailabilitycontrol.cpp \
$$PWD/qgstreamerplayerserviceplugin.cpp
target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
INSTALLS += target
OTHER_FILES += \
mediaplayer.json