summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-02-12 16:23:59 +0100
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-02-25 16:50:09 +0000
commitc82402e158100d1c755bdcbaab731952ad487821 (patch)
treee0c0157912d7b0ed4bb197759a604ef708c2ff1a /src/plugins
parentdd7c19ea9d6be922faca57013b06b0f2b0787169 (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')
-rw-r--r--src/plugins/alsa/alsa.pro8
-rw-r--r--src/plugins/android/src/src.pro9
-rw-r--r--src/plugins/android/videonode/videonode.pro11
-rw-r--r--src/plugins/audiocapture/audiocapture.pro8
-rw-r--r--src/plugins/avfoundation/camera/camera.pro8
-rw-r--r--src/plugins/avfoundation/mediaplayer/mediaplayer.pro8
-rw-r--r--src/plugins/coreaudio/coreaudio.pro8
-rw-r--r--src/plugins/directshow/directshow.pro7
-rw-r--r--src/plugins/gstreamer/audiodecoder/audiodecoder.pro7
-rw-r--r--src/plugins/gstreamer/camerabin/camerabin.pro8
-rw-r--r--src/plugins/gstreamer/mediacapture/mediacapture.pro8
-rw-r--r--src/plugins/gstreamer/mediaplayer/mediaplayer.pro8
-rw-r--r--src/plugins/m3u/m3u.pro8
-rw-r--r--src/plugins/opensles/opensles.pro8
-rw-r--r--src/plugins/pulseaudio/pulseaudio.pro8
-rw-r--r--src/plugins/qnx-audio/audio/audio.pro5
-rw-r--r--src/plugins/qnx/qnx.pro8
-rw-r--r--src/plugins/resourcepolicy/resourcepolicy.pro7
-rw-r--r--src/plugins/v4l/v4l.pro8
-rw-r--r--src/plugins/videonode/egl/egl.pro11
-rw-r--r--src/plugins/videonode/imx6/imx6.pro11
-rw-r--r--src/plugins/windowsaudio/windowsaudio.pro8
-rw-r--r--src/plugins/winrt/winrt.pro8
-rw-r--r--src/plugins/wmf/wmf.pro8
24 files changed, 100 insertions, 96 deletions
diff --git a/src/plugins/alsa/alsa.pro b/src/plugins/alsa/alsa.pro
index 481c57eaf..56657f100 100644
--- a/src/plugins/alsa/alsa.pro
+++ b/src/plugins/alsa/alsa.pro
@@ -1,10 +1,6 @@
TARGET = qtaudio_alsa
QT += multimedia-private
-PLUGIN_TYPE = audio
-PLUGIN_CLASS_NAME = QAlsaPlugin
-load(qt_plugin)
-
LIBS += -lasound
HEADERS += \
@@ -21,3 +17,7 @@ SOURCES += \
OTHER_FILES += \
alsa.json
+
+PLUGIN_TYPE = audio
+PLUGIN_CLASS_NAME = QAlsaPlugin
+load(qt_plugin)
diff --git a/src/plugins/android/src/src.pro b/src/plugins/android/src/src.pro
index 6a472a0a8..166bcc42b 100644
--- a/src/plugins/android/src/src.pro
+++ b/src/plugins/android/src/src.pro
@@ -1,9 +1,6 @@
TARGET = qtmedia_android
-QT += multimedia-private core-private network
-PLUGIN_TYPE = mediaservice
-PLUGIN_CLASS_NAME = QAndroidMediaServicePlugin
-load(qt_plugin)
+QT += multimedia-private core-private network
HEADERS += \
qandroidmediaserviceplugin.h
@@ -17,3 +14,7 @@ include (mediaplayer/mediaplayer.pri)
include (mediacapture/mediacapture.pri)
OTHER_FILES += android_mediaservice.json
+
+PLUGIN_TYPE = mediaservice
+PLUGIN_CLASS_NAME = QAndroidMediaServicePlugin
+load(qt_plugin)
diff --git a/src/plugins/android/videonode/videonode.pro b/src/plugins/android/videonode/videonode.pro
index 661e36436..daf07c9ec 100644
--- a/src/plugins/android/videonode/videonode.pro
+++ b/src/plugins/android/videonode/videonode.pro
@@ -1,10 +1,6 @@
TARGET = qtsgvideonode_android
-QT += quick multimedia-private qtmultimediaquicktools-private
-PLUGIN_TYPE = video/videonode
-PLUGIN_EXTENDS = quick
-PLUGIN_CLASS_NAME = QAndroidSGVideoNodeFactoryPlugin
-load(qt_plugin)
+QT += quick multimedia-private qtmultimediaquicktools-private
HEADERS += \
qandroidsgvideonodeplugin.h \
@@ -15,3 +11,8 @@ SOURCES += \
qandroidsgvideonode.cpp
OTHER_FILES += android_videonode.json
+
+PLUGIN_TYPE = video/videonode
+PLUGIN_EXTENDS = quick
+PLUGIN_CLASS_NAME = QAndroidSGVideoNodeFactoryPlugin
+load(qt_plugin)
diff --git a/src/plugins/audiocapture/audiocapture.pro b/src/plugins/audiocapture/audiocapture.pro
index 833e4b5fc..ba2e5c802 100644
--- a/src/plugins/audiocapture/audiocapture.pro
+++ b/src/plugins/audiocapture/audiocapture.pro
@@ -1,10 +1,6 @@
TARGET = qtmedia_audioengine
QT += multimedia-private
-PLUGIN_TYPE=mediaservice
-PLUGIN_CLASS_NAME = AudioCaptureServicePlugin
-load(qt_plugin)
-
HEADERS += audioencodercontrol.h \
audiocontainercontrol.h \
audiomediarecordercontrol.h \
@@ -25,3 +21,7 @@ SOURCES += audioencodercontrol.cpp \
OTHER_FILES += \
audiocapture.json
+
+PLUGIN_TYPE = mediaservice
+PLUGIN_CLASS_NAME = AudioCaptureServicePlugin
+load(qt_plugin)
diff --git a/src/plugins/avfoundation/camera/camera.pro b/src/plugins/avfoundation/camera/camera.pro
index a82d88ded..4e443cc1d 100644
--- a/src/plugins/avfoundation/camera/camera.pro
+++ b/src/plugins/avfoundation/camera/camera.pro
@@ -4,10 +4,6 @@ CONFIG += no_keywords
TARGET = qavfcamera
QT += multimedia-private network
-PLUGIN_TYPE = mediaservice
-PLUGIN_CLASS_NAME = AVFServicePlugin
-load(qt_plugin)
-
LIBS += -framework AudioToolbox \
-framework CoreAudio \
-framework QuartzCore \
@@ -79,3 +75,7 @@ OBJECTIVE_SOURCES += avfcamerazoomcontrol.mm \
avfmediarecordercontrol_ios.mm
}
+
+PLUGIN_TYPE = mediaservice
+PLUGIN_CLASS_NAME = AVFServicePlugin
+load(qt_plugin)
diff --git a/src/plugins/avfoundation/mediaplayer/mediaplayer.pro b/src/plugins/avfoundation/mediaplayer/mediaplayer.pro
index 28cdc2727..ff9e5bca9 100644
--- a/src/plugins/avfoundation/mediaplayer/mediaplayer.pro
+++ b/src/plugins/avfoundation/mediaplayer/mediaplayer.pro
@@ -7,10 +7,6 @@ CONFIG += no_keywords
TARGET = qavfmediaplayer
QT += multimedia-private network
-PLUGIN_TYPE = mediaservice
-PLUGIN_CLASS_NAME = AVFMediaPlayerServicePlugin
-load(qt_plugin)
-
LIBS += -framework AVFoundation -framework CoreMedia
DEFINES += QMEDIA_AVF_MEDIAPLAYER
@@ -74,3 +70,7 @@ ios {
OTHER_FILES += \
avfmediaplayer.json
+
+PLUGIN_TYPE = mediaservice
+PLUGIN_CLASS_NAME = AVFMediaPlayerServicePlugin
+load(qt_plugin)
diff --git a/src/plugins/coreaudio/coreaudio.pro b/src/plugins/coreaudio/coreaudio.pro
index 146851493..0757b463c 100644
--- a/src/plugins/coreaudio/coreaudio.pro
+++ b/src/plugins/coreaudio/coreaudio.pro
@@ -1,10 +1,6 @@
TARGET = qtaudio_coreaudio
QT += multimedia-private
-PLUGIN_TYPE = audio
-PLUGIN_CLASS_NAME = CoreAudioPlugin
-
-load(qt_plugin)
OTHER_FILES += \
coreaudio.json
@@ -37,3 +33,7 @@ ios {
LIBS += \
-framework CoreAudio \
-framework AudioToolbox
+
+PLUGIN_TYPE = audio
+PLUGIN_CLASS_NAME = CoreAudioPlugin
+load(qt_plugin)
diff --git a/src/plugins/directshow/directshow.pro b/src/plugins/directshow/directshow.pro
index 4d7183923..280b52619 100644
--- a/src/plugins/directshow/directshow.pro
+++ b/src/plugins/directshow/directshow.pro
@@ -2,9 +2,6 @@ TARGET = dsengine
win32:!qtHaveModule(opengl)|contains(QT_CONFIG,dynamicgl) {
LIBS_PRIVATE += -lgdi32 -luser32
}
-PLUGIN_TYPE=mediaservice
-PLUGIN_CLASS_NAME = DSServicePlugin
-load(qt_plugin)
QT += multimedia-private
@@ -21,3 +18,7 @@ include(camera/camera.pri)
OTHER_FILES += \
directshow.json \
directshow_camera.json
+
+PLUGIN_TYPE = mediaservice
+PLUGIN_CLASS_NAME = DSServicePlugin
+load(qt_plugin)
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)
diff --git a/src/plugins/m3u/m3u.pro b/src/plugins/m3u/m3u.pro
index 3897e2de8..d46911e0d 100644
--- a/src/plugins/m3u/m3u.pro
+++ b/src/plugins/m3u/m3u.pro
@@ -1,12 +1,12 @@
TARGET = qtmultimedia_m3u
QT += multimedia-private
-PLUGIN_TYPE=playlistformats
-PLUGIN_CLASS_NAME = QM3uPlaylistPlugin
-load(qt_plugin)
-
HEADERS += qm3uhandler.h
SOURCES += qm3uhandler.cpp
OTHER_FILES += \
m3u.json
+
+PLUGIN_TYPE = playlistformats
+PLUGIN_CLASS_NAME = QM3uPlaylistPlugin
+load(qt_plugin)
diff --git a/src/plugins/opensles/opensles.pro b/src/plugins/opensles/opensles.pro
index aa8e05444..2bb0f3cf5 100644
--- a/src/plugins/opensles/opensles.pro
+++ b/src/plugins/opensles/opensles.pro
@@ -1,10 +1,6 @@
TARGET = qtaudio_opensles
QT += multimedia-private core-private
-PLUGIN_TYPE = audio
-PLUGIN_CLASS_NAME = QOpenSLESPlugin
-load(qt_plugin)
-
LIBS += -lOpenSLES
HEADERS += \
@@ -23,3 +19,7 @@ SOURCES += \
OTHER_FILES += \
opensles.json
+
+PLUGIN_TYPE = audio
+PLUGIN_CLASS_NAME = QOpenSLESPlugin
+load(qt_plugin)
diff --git a/src/plugins/pulseaudio/pulseaudio.pro b/src/plugins/pulseaudio/pulseaudio.pro
index e8ab9317c..7f4d3de22 100644
--- a/src/plugins/pulseaudio/pulseaudio.pro
+++ b/src/plugins/pulseaudio/pulseaudio.pro
@@ -1,10 +1,6 @@
TARGET = qtmedia_pulse
QT += multimedia-private
-PLUGIN_TYPE = audio
-PLUGIN_CLASS_NAME = QPulseAudioPlugin
-load(qt_plugin)
-
CONFIG += link_pkgconfig
PKGCONFIG += libpulse
@@ -24,3 +20,7 @@ SOURCES += qpulseaudioplugin.cpp \
OTHER_FILES += \
pulseaudio.json
+
+PLUGIN_TYPE = audio
+PLUGIN_CLASS_NAME = QPulseAudioPlugin
+load(qt_plugin)
diff --git a/src/plugins/qnx-audio/audio/audio.pro b/src/plugins/qnx-audio/audio/audio.pro
index 35ddf73de..bf4300a71 100644
--- a/src/plugins/qnx-audio/audio/audio.pro
+++ b/src/plugins/qnx-audio/audio/audio.pro
@@ -2,8 +2,6 @@ TARGET = qtmedia_qnx_audio
QT += multimedia-private
CONFIG += no_private_qt_headers_warning
-PLUGIN_TYPE = audio
-load(qt_plugin)
LIBS += -lasound
@@ -20,3 +18,6 @@ SOURCES += qnxaudioplugin.cpp \
qnxaudioutils.cpp
OTHER_FILES += qnx_audio.json
+
+PLUGIN_TYPE = audio
+load(qt_plugin)
diff --git a/src/plugins/qnx/qnx.pro b/src/plugins/qnx/qnx.pro
index f01562116..4d76fa5f7 100644
--- a/src/plugins/qnx/qnx.pro
+++ b/src/plugins/qnx/qnx.pro
@@ -1,10 +1,6 @@
TARGET = qtmedia_qnx
QT += multimedia-private gui-private
-PLUGIN_TYPE=mediaservice
-PLUGIN_CLASS_NAME = BbServicePlugin
-load(qt_plugin)
-
LIBS += -lscreen
include(common/common.pri)
@@ -20,3 +16,7 @@ blackberry {
SOURCES += neutrinoserviceplugin.cpp
OTHER_FILES += neutrino_mediaservice.json
}
+
+PLUGIN_TYPE = mediaservice
+PLUGIN_CLASS_NAME = BbServicePlugin
+load(qt_plugin)
diff --git a/src/plugins/resourcepolicy/resourcepolicy.pro b/src/plugins/resourcepolicy/resourcepolicy.pro
index 4805c5250..e333bac09 100644
--- a/src/plugins/resourcepolicy/resourcepolicy.pro
+++ b/src/plugins/resourcepolicy/resourcepolicy.pro
@@ -4,10 +4,6 @@ QT += multimedia-private
CONFIG += no_private_qt_headers_warning link_pkgconfig
PKGCONFIG += libresourceqt5
-PLUGIN_TYPE = resourcepolicy
-PLUGIN_CLASS_NAME = ResourceQtPolicyPlugin
-load(qt_plugin)
-
INCLUDEPATH += $$PWD \
$${SOURCE_DIR}/src/multimedia
@@ -21,3 +17,6 @@ SOURCES += \
$$PWD/resourcepolicyimpl.cpp \
$$PWD/resourcepolicyint.cpp
+PLUGIN_TYPE = resourcepolicy
+PLUGIN_CLASS_NAME = ResourceQtPolicyPlugin
+load(qt_plugin)
diff --git a/src/plugins/v4l/v4l.pro b/src/plugins/v4l/v4l.pro
index c5e953538..28d89e3e9 100644
--- a/src/plugins/v4l/v4l.pro
+++ b/src/plugins/v4l/v4l.pro
@@ -1,11 +1,11 @@
TARGET = qtmedia_v4lengine
QT += multimedia-private
-PLUGIN_TYPE = mediaservice
-PLUGIN_CLASS_NAME = V4LServicePlugin
-load(qt_plugin)
-
HEADERS += v4lserviceplugin.h
SOURCES += v4lserviceplugin.cpp
include(radio/radio.pri)
+
+PLUGIN_TYPE = mediaservice
+PLUGIN_CLASS_NAME = V4LServicePlugin
+load(qt_plugin)
diff --git a/src/plugins/videonode/egl/egl.pro b/src/plugins/videonode/egl/egl.pro
index a6256cea1..7151123ea 100644
--- a/src/plugins/videonode/egl/egl.pro
+++ b/src/plugins/videonode/egl/egl.pro
@@ -1,12 +1,8 @@
TARGET = eglvideonode
+
QT += multimedia-private qtmultimediaquicktools-private
CONFIG += egl
-PLUGIN_TYPE=video/videonode
-PLUGIN_EXTENDS = quick
-PLUGIN_CLASS_NAME = QSGVideoNodeFactory_EGL
-load(qt_plugin)
-
HEADERS += \
qsgvideonode_egl.h
@@ -15,3 +11,8 @@ SOURCES += \
OTHER_FILES += \
egl.json
+
+PLUGIN_TYPE = video/videonode
+PLUGIN_EXTENDS = quick
+PLUGIN_CLASS_NAME = QSGVideoNodeFactory_EGL
+load(qt_plugin)
diff --git a/src/plugins/videonode/imx6/imx6.pro b/src/plugins/videonode/imx6/imx6.pro
index 36e25e86b..c8085a31e 100644
--- a/src/plugins/videonode/imx6/imx6.pro
+++ b/src/plugins/videonode/imx6/imx6.pro
@@ -1,10 +1,6 @@
TARGET = imx6vivantevideonode
-QT += multimedia-private qtmultimediaquicktools-private
-PLUGIN_TYPE=video/videonode
-PLUGIN_EXTENDS = quick
-PLUGIN_CLASS_NAME = QSGVivanteVideoNodeFactory
-load(qt_plugin)
+QT += multimedia-private qtmultimediaquicktools-private
HEADERS += \
qsgvivantevideonode.h \
@@ -20,3 +16,8 @@ SOURCES += \
OTHER_FILES += \
imx6.json
+
+PLUGIN_TYPE = video/videonode
+PLUGIN_EXTENDS = quick
+PLUGIN_CLASS_NAME = QSGVivanteVideoNodeFactory
+load(qt_plugin)
diff --git a/src/plugins/windowsaudio/windowsaudio.pro b/src/plugins/windowsaudio/windowsaudio.pro
index 7e8e4320b..ce64847dc 100644
--- a/src/plugins/windowsaudio/windowsaudio.pro
+++ b/src/plugins/windowsaudio/windowsaudio.pro
@@ -1,10 +1,6 @@
TARGET = qtaudio_windows
QT += multimedia-private
-PLUGIN_TYPE = audio
-PLUGIN_CLASS_NAME = QWindowsAudioPlugin
-load(qt_plugin)
-
LIBS += -lstrmiids -lole32 -loleaut32
!wince*:LIBS += -lwinmm
@@ -24,3 +20,7 @@ SOURCES += \
OTHER_FILES += \
windowsaudio.json
+
+PLUGIN_TYPE = audio
+PLUGIN_CLASS_NAME = QWindowsAudioPlugin
+load(qt_plugin)
diff --git a/src/plugins/winrt/winrt.pro b/src/plugins/winrt/winrt.pro
index 2f87ea8ff..87e44cce2 100644
--- a/src/plugins/winrt/winrt.pro
+++ b/src/plugins/winrt/winrt.pro
@@ -1,10 +1,6 @@
TARGET = winrtengine
QT += multimedia-private
-PLUGIN_TYPE=mediaservice
-PLUGIN_CLASS_NAME = WinRTServicePlugin
-load(qt_plugin)
-
LIBS += -lmfplat -lmfuuid -loleaut32 -ld3d11 -lruntimeobject
HEADERS += \
@@ -43,3 +39,7 @@ SOURCES += \
OTHER_FILES += \
winrt.json
+
+PLUGIN_TYPE = mediaservice
+PLUGIN_CLASS_NAME = WinRTServicePlugin
+load(qt_plugin)
diff --git a/src/plugins/wmf/wmf.pro b/src/plugins/wmf/wmf.pro
index 1f43bb128..e83c51595 100644
--- a/src/plugins/wmf/wmf.pro
+++ b/src/plugins/wmf/wmf.pro
@@ -5,10 +5,6 @@ win32:!qtHaveModule(opengl) {
LIBS_PRIVATE += -lgdi32 -luser32
}
-PLUGIN_TYPE=mediaservice
-PLUGIN_CLASS_NAME = WMFServicePlugin
-load(qt_plugin)
-
INCLUDEPATH += .
HEADERS += \
@@ -32,3 +28,7 @@ include (decoder/decoder.pri)
OTHER_FILES += \
wmf.json
+
+PLUGIN_TYPE = mediaservice
+PLUGIN_CLASS_NAME = WMFServicePlugin
+load(qt_plugin)