diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-10-24 15:33:02 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-05 14:01:31 +0100 |
| commit | 0affd9023ff1146c822cd188612c7727947ea618 (patch) | |
| tree | 3e1f3efed0801fe275beff7511f45b9d856e9df5 /src/plugins/gstreamer | |
| parent | 9dbcbc0b2f4a932a1f68572135de44124bab064c (diff) | |
| download | qtmultimedia-0affd9023ff1146c822cd188612c7727947ea618.tar.gz | |
adjust to qt_plugin.prf changes
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>
Diffstat (limited to 'src/plugins/gstreamer')
4 files changed, 4 insertions, 22 deletions
diff --git a/src/plugins/gstreamer/audiodecoder/audiodecoder.pro b/src/plugins/gstreamer/audiodecoder/audiodecoder.pro index 0e0209007..e559f7e02 100644 --- a/src/plugins/gstreamer/audiodecoder/audiodecoder.pro +++ b/src/plugins/gstreamer/audiodecoder/audiodecoder.pro @@ -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 diff --git a/src/plugins/gstreamer/camerabin/camerabin.pro b/src/plugins/gstreamer/camerabin/camerabin.pro index 75c948f40..5a2dde161 100644 --- a/src/plugins/gstreamer/camerabin/camerabin.pro +++ b/src/plugins/gstreamer/camerabin/camerabin.pro @@ -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 diff --git a/src/plugins/gstreamer/mediacapture/mediacapture.pro b/src/plugins/gstreamer/mediacapture/mediacapture.pro index d9feb811f..9c6cc3c5a 100644 --- a/src/plugins/gstreamer/mediacapture/mediacapture.pro +++ b/src/plugins/gstreamer/mediacapture/mediacapture.pro @@ -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 diff --git a/src/plugins/gstreamer/mediaplayer/mediaplayer.pro b/src/plugins/gstreamer/mediaplayer/mediaplayer.pro index eab084394..70e5c8d0b 100644 --- a/src/plugins/gstreamer/mediaplayer/mediaplayer.pro +++ b/src/plugins/gstreamer/mediaplayer/mediaplayer.pro @@ -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 |