diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-02-12 16:23:59 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-02-25 16:50:09 +0000 |
| commit | c82402e158100d1c755bdcbaab731952ad487821 (patch) | |
| tree | e0c0157912d7b0ed4bb197759a604ef708c2ff1a /src/plugins/gstreamer | |
| parent | dd7c19ea9d6be922faca57013b06b0f2b0787169 (diff) | |
consistently put {qt,qml}_{module,plugin} at the end of project files
this fixes static builds by ensuring that all dependencies are exported.
Task-number: QTBUG-51071
Change-Id: I8e1554b648327ea2fb342b882ce8e439bd6f271d
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
Diffstat (limited to 'src/plugins/gstreamer')
4 files changed, 15 insertions, 16 deletions
diff --git a/src/plugins/gstreamer/audiodecoder/audiodecoder.pro b/src/plugins/gstreamer/audiodecoder/audiodecoder.pro index 8cd1d587e..4e816e920 100644 --- a/src/plugins/gstreamer/audiodecoder/audiodecoder.pro +++ b/src/plugins/gstreamer/audiodecoder/audiodecoder.pro @@ -1,9 +1,5 @@ TARGET = gstaudiodecoder -PLUGIN_TYPE = mediaservice -PLUGIN_CLASS_NAME = QGstreamerAudioDecoderServicePlugin -load(qt_plugin) - include(../common.pri) INCLUDEPATH += $$PWD @@ -23,3 +19,6 @@ SOURCES += \ OTHER_FILES += \ audiodecoder.json +PLUGIN_TYPE = mediaservice +PLUGIN_CLASS_NAME = QGstreamerAudioDecoderServicePlugin +load(qt_plugin) diff --git a/src/plugins/gstreamer/camerabin/camerabin.pro b/src/plugins/gstreamer/camerabin/camerabin.pro index b807071f2..214489f3e 100644 --- a/src/plugins/gstreamer/camerabin/camerabin.pro +++ b/src/plugins/gstreamer/camerabin/camerabin.pro @@ -2,10 +2,6 @@ TARGET = gstcamerabin QT += multimedia-private -PLUGIN_TYPE = mediaservice -PLUGIN_CLASS_NAME = CameraBinServicePlugin -load(qt_plugin) - include(../common.pri) INCLUDEPATH += $$PWD \ @@ -101,3 +97,7 @@ config_linux_v4l: { OTHER_FILES += \ camerabin.json + +PLUGIN_TYPE = mediaservice +PLUGIN_CLASS_NAME = CameraBinServicePlugin +load(qt_plugin) diff --git a/src/plugins/gstreamer/mediacapture/mediacapture.pro b/src/plugins/gstreamer/mediacapture/mediacapture.pro index 5baa0fd8f..db5210d4d 100644 --- a/src/plugins/gstreamer/mediacapture/mediacapture.pro +++ b/src/plugins/gstreamer/mediacapture/mediacapture.pro @@ -1,9 +1,5 @@ TARGET = gstmediacapture -PLUGIN_TYPE = mediaservice -PLUGIN_CLASS_NAME = QGstreamerCaptureServicePlugin -load(qt_plugin) - include(../common.pri) INCLUDEPATH += $$PWD @@ -50,3 +46,7 @@ use_gstreamer_camera:config_linux_v4l { OTHER_FILES += \ mediacapture.json } + +PLUGIN_TYPE = mediaservice +PLUGIN_CLASS_NAME = QGstreamerCaptureServicePlugin +load(qt_plugin) diff --git a/src/plugins/gstreamer/mediaplayer/mediaplayer.pro b/src/plugins/gstreamer/mediaplayer/mediaplayer.pro index b986fc787..5ccf89bfd 100644 --- a/src/plugins/gstreamer/mediaplayer/mediaplayer.pro +++ b/src/plugins/gstreamer/mediaplayer/mediaplayer.pro @@ -1,9 +1,5 @@ TARGET = gstmediaplayer -PLUGIN_TYPE = mediaservice -PLUGIN_CLASS_NAME = QGstreamerPlayerServicePlugin -load(qt_plugin) - include(../common.pri) INCLUDEPATH += $$PWD @@ -28,3 +24,7 @@ SOURCES += \ OTHER_FILES += \ mediaplayer.json + +PLUGIN_TYPE = mediaservice +PLUGIN_CLASS_NAME = QGstreamerPlayerServicePlugin +load(qt_plugin) |