From 4b62c926b7d9c8a7ae1434b1bdac145882512487 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Mon, 10 Dec 2012 14:35:04 +0200 Subject: [PATCH] Add PLUGIN_CLASS_NAME to qtmultimedia plugins Needed for automating static plugin loading. Task-number: QTBUG-28131 Change-Id: Ia392b112fc46dedd34c9ffdbd6e874dbbfeaef83 Reviewed-by: Oswald Buddenhagen --- src/plugins/audiocapture/audiocapture.pro | 1 + src/plugins/avfoundation/camera/camera.pro | 1 + src/plugins/avfoundation/mediaplayer/mediaplayer.pro | 1 + src/plugins/blackberry/mediaservice/mediaservice.pro | 1 + src/plugins/directshow/directshow.pro | 1 + src/plugins/gstreamer/audiodecoder/audiodecoder.pro | 1 + src/plugins/gstreamer/camerabin/camerabin.pro | 1 + src/plugins/gstreamer/mediacapture/mediacapture.pro | 1 + src/plugins/gstreamer/mediaplayer/mediaplayer.pro | 1 + src/plugins/m3u/m3u.pro | 1 + src/plugins/pulseaudio/pulseaudio.pro | 1 + src/plugins/qt7/qt7.pro | 1 + src/plugins/v4l/v4l.pro | 1 + src/plugins/wmf/wmf.pro | 1 + .../unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro | 1 + .../unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro | 1 + .../unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro | 1 + .../unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro | 1 + 18 files changed, 18 insertions(+) diff --git a/src/plugins/audiocapture/audiocapture.pro b/src/plugins/audiocapture/audiocapture.pro index f58f43e..833e4b5 100644 --- a/src/plugins/audiocapture/audiocapture.pro +++ b/src/plugins/audiocapture/audiocapture.pro @@ -2,6 +2,7 @@ TARGET = qtmedia_audioengine QT += multimedia-private PLUGIN_TYPE=mediaservice +PLUGIN_CLASS_NAME = AudioCaptureServicePlugin load(qt_plugin) HEADERS += audioencodercontrol.h \ diff --git a/src/plugins/avfoundation/camera/camera.pro b/src/plugins/avfoundation/camera/camera.pro index 2eced18..3c75117 100644 --- a/src/plugins/avfoundation/camera/camera.pro +++ b/src/plugins/avfoundation/camera/camera.pro @@ -5,6 +5,7 @@ TARGET = qavfcamera QT += multimedia-private network PLUGIN_TYPE = mediaservice +PLUGIN_CLASS_NAME = AVFServicePlugin load(qt_plugin) LIBS += -framework AppKit -framework AudioUnit \ diff --git a/src/plugins/avfoundation/mediaplayer/mediaplayer.pro b/src/plugins/avfoundation/mediaplayer/mediaplayer.pro index 45a30ac..d1957d5 100644 --- a/src/plugins/avfoundation/mediaplayer/mediaplayer.pro +++ b/src/plugins/avfoundation/mediaplayer/mediaplayer.pro @@ -8,6 +8,7 @@ TARGET = qavfmediaplayer QT += multimedia-private network PLUGIN_TYPE = mediaservice +PLUGIN_CLASS_NAME = AVFMediaPlayerServicePlugin load(qt_plugin) LIBS += -framework AVFoundation -framework CoreMedia diff --git a/src/plugins/blackberry/mediaservice/mediaservice.pro b/src/plugins/blackberry/mediaservice/mediaservice.pro index 9c658a5..3a713ee 100644 --- a/src/plugins/blackberry/mediaservice/mediaservice.pro +++ b/src/plugins/blackberry/mediaservice/mediaservice.pro @@ -3,6 +3,7 @@ QT += multimedia-private gui-private CONFIG += no_private_qt_headers_warning PLUGIN_TYPE=mediaservice +PLUGIN_CLASS_NAME = BbServicePlugin load(qt_plugin) LIBS += -lmmrndclient -lstrm -lscreen diff --git a/src/plugins/directshow/directshow.pro b/src/plugins/directshow/directshow.pro index 97f2834..4967698 100644 --- a/src/plugins/directshow/directshow.pro +++ b/src/plugins/directshow/directshow.pro @@ -1,6 +1,7 @@ TARGET = dsengine PLUGIN_TYPE=mediaservice +PLUGIN_CLASS_NAME = DSServicePlugin load(qt_plugin) QT += multimedia diff --git a/src/plugins/gstreamer/audiodecoder/audiodecoder.pro b/src/plugins/gstreamer/audiodecoder/audiodecoder.pro index e559f7e..8cd1d58 100644 --- a/src/plugins/gstreamer/audiodecoder/audiodecoder.pro +++ b/src/plugins/gstreamer/audiodecoder/audiodecoder.pro @@ -1,6 +1,7 @@ TARGET = gstaudiodecoder PLUGIN_TYPE = mediaservice +PLUGIN_CLASS_NAME = QGstreamerAudioDecoderServicePlugin load(qt_plugin) include(../common.pri) diff --git a/src/plugins/gstreamer/camerabin/camerabin.pro b/src/plugins/gstreamer/camerabin/camerabin.pro index 5a2dde1..7f84fe5 100644 --- a/src/plugins/gstreamer/camerabin/camerabin.pro +++ b/src/plugins/gstreamer/camerabin/camerabin.pro @@ -3,6 +3,7 @@ TARGET = gstcamerabin QT += multimedia-private PLUGIN_TYPE = mediaservice +PLUGIN_CLASS_NAME = CameraBinServicePlugin load(qt_plugin) include(../common.pri) diff --git a/src/plugins/gstreamer/mediacapture/mediacapture.pro b/src/plugins/gstreamer/mediacapture/mediacapture.pro index 9c6cc3c..e8d039f 100644 --- a/src/plugins/gstreamer/mediacapture/mediacapture.pro +++ b/src/plugins/gstreamer/mediacapture/mediacapture.pro @@ -1,6 +1,7 @@ TARGET = gstmediacapture PLUGIN_TYPE = mediaservice +PLUGIN_CLASS_NAME = QGstreamerCaptureServicePlugin load(qt_plugin) include(../common.pri) diff --git a/src/plugins/gstreamer/mediaplayer/mediaplayer.pro b/src/plugins/gstreamer/mediaplayer/mediaplayer.pro index 70e5c8d..2ca9377 100644 --- a/src/plugins/gstreamer/mediaplayer/mediaplayer.pro +++ b/src/plugins/gstreamer/mediaplayer/mediaplayer.pro @@ -1,6 +1,7 @@ TARGET = gstmediaplayer PLUGIN_TYPE = mediaservice +PLUGIN_CLASS_NAME = QGstreamerPlayerServicePlugin load(qt_plugin) include(../common.pri) diff --git a/src/plugins/m3u/m3u.pro b/src/plugins/m3u/m3u.pro index 875e815..3897e2d 100644 --- a/src/plugins/m3u/m3u.pro +++ b/src/plugins/m3u/m3u.pro @@ -2,6 +2,7 @@ TARGET = qtmultimedia_m3u QT += multimedia-private PLUGIN_TYPE=playlistformats +PLUGIN_CLASS_NAME = QM3uPlaylistPlugin load(qt_plugin) HEADERS += qm3uhandler.h diff --git a/src/plugins/pulseaudio/pulseaudio.pro b/src/plugins/pulseaudio/pulseaudio.pro index ac049dc..e8ab931 100644 --- a/src/plugins/pulseaudio/pulseaudio.pro +++ b/src/plugins/pulseaudio/pulseaudio.pro @@ -2,6 +2,7 @@ TARGET = qtmedia_pulse QT += multimedia-private PLUGIN_TYPE = audio +PLUGIN_CLASS_NAME = QPulseAudioPlugin load(qt_plugin) CONFIG += link_pkgconfig diff --git a/src/plugins/qt7/qt7.pro b/src/plugins/qt7/qt7.pro index edc3ddd..ae87bd4 100644 --- a/src/plugins/qt7/qt7.pro +++ b/src/plugins/qt7/qt7.pro @@ -8,6 +8,7 @@ QT += multimedia-private network } PLUGIN_TYPE = mediaservice +PLUGIN_CLASS_NAME = QT7ServicePlugin load(qt_plugin) !simulator { diff --git a/src/plugins/v4l/v4l.pro b/src/plugins/v4l/v4l.pro index 92c5619..c5e9535 100644 --- a/src/plugins/v4l/v4l.pro +++ b/src/plugins/v4l/v4l.pro @@ -2,6 +2,7 @@ TARGET = qtmedia_v4lengine QT += multimedia-private PLUGIN_TYPE = mediaservice +PLUGIN_CLASS_NAME = V4LServicePlugin load(qt_plugin) HEADERS += v4lserviceplugin.h diff --git a/src/plugins/wmf/wmf.pro b/src/plugins/wmf/wmf.pro index b9c2b41..e16c91e 100644 --- a/src/plugins/wmf/wmf.pro +++ b/src/plugins/wmf/wmf.pro @@ -6,6 +6,7 @@ QT += multimedia-private network } PLUGIN_TYPE=mediaservice +PLUGIN_CLASS_NAME = WMFServicePlugin load(qt_plugin) DEPENDPATH += . diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro index ad31116..843574e 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro @@ -3,6 +3,7 @@ QT += multimedia-private CONFIG += no_private_qt_headers_warning PLUGIN_TYPE=mediaservice +PLUGIN_CLASS_NAME = MockServicePlugin1 load(qt_plugin) DESTDIR = ../$${PLUGIN_TYPE} diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro index 6b30d77..41380f7 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro @@ -3,6 +3,7 @@ QT += multimedia-private CONFIG += no_private_qt_headers_warning PLUGIN_TYPE=mediaservice +PLUGIN_CLASS_NAME = MockServicePlugin2 load(qt_plugin) DESTDIR = ../$${PLUGIN_TYPE} diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro index bae1af9..0e5ff0b 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro @@ -3,6 +3,7 @@ QT += multimedia-private CONFIG += no_private_qt_headers_warning PLUGIN_TYPE=mediaservice +PLUGIN_CLASS_NAME = MockServicePlugin3 load(qt_plugin) DESTDIR = ../$${PLUGIN_TYPE} diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro index ccd8b0e..3e83ac9 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro @@ -3,6 +3,7 @@ QT += multimedia-private CONFIG += no_private_qt_headers_warning PLUGIN_TYPE=mediaservice +PLUGIN_CLASS_NAME = MockServicePlugin4 load(qt_plugin) DESTDIR = ../$${PLUGIN_TYPE} -- 2.7.4