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>

src/multimedia/multimedia.pro

@@ -12,8 +12,6 @@ MODULE_PLUGIN_TYPES = \
 
 QMAKE_DOCS = $$PWD/doc/qtmultimedia.qdocconf
 
-load(qt_module)
-
 INCLUDEPATH *= .
 
 PRIVATE_HEADERS += \
@@ -87,3 +85,5 @@ ANDROID_FEATURES += \
 win32: LIBS_PRIVATE += -luuid
 
 HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
+
+load(qt_module)

src/multimediawidgets/multimediawidgets.pro

@@ -7,8 +7,6 @@ qtHaveModule(opengl):!contains(QT_CONFIG, opengles1) {
    DEFINES += QT_NO_OPENGL
 }
 
-load(qt_module)
-
 PRIVATE_HEADERS += \
     qvideowidget_p.h \
     qpaintervideosurface_p.h \
@@ -44,3 +42,5 @@ maemo6 {
 }
 
 HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
+
+load(qt_module)

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)

src/plugins/android/src/src.pro

@@ -1,9 +1,6 @@
 TARGET = qtmedia_android
-QT += multimedia-private core-private network
 
-PLUGIN_TYPE = mediaservice
+QT += multimedia-private core-private network
-PLUGIN_CLASS_NAME = QAndroidMediaServicePlugin
-load(qt_plugin)
 
 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)

src/plugins/android/videonode/videonode.pro

@@ -1,10 +1,6 @@
 TARGET = qtsgvideonode_android
-QT += quick multimedia-private qtmultimediaquicktools-private
 
-PLUGIN_TYPE = video/videonode
+QT += quick multimedia-private qtmultimediaquicktools-private
-PLUGIN_EXTENDS = quick
-PLUGIN_CLASS_NAME = QAndroidSGVideoNodeFactoryPlugin
-load(qt_plugin)
 
 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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

src/plugins/videonode/imx6/imx6.pro

@@ -1,10 +1,6 @@
 TARGET = imx6vivantevideonode
-QT += multimedia-private qtmultimediaquicktools-private
 
-PLUGIN_TYPE=video/videonode
+QT += multimedia-private qtmultimediaquicktools-private
-PLUGIN_EXTENDS = quick
-PLUGIN_CLASS_NAME = QSGVivanteVideoNodeFactory
-load(qt_plugin)
 
 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)

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)

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)

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)

src/qtmultimediaquicktools/qtmultimediaquicktools.pro

@@ -2,8 +2,6 @@ TARGET = QtMultimediaQuick_p
 QT = core quick multimedia-private
 CONFIG += internal_module
 
-load(qt_module)
-
 DEFINES += QT_BUILD_QTMM_QUICK_LIB
 
 # Header files must go inside source directory of a module
@@ -47,3 +45,5 @@ OTHER_FILES += \
     shaders/biplanaryuvvideo_swizzle.frag \
     shaders/triplanaryuvvideo.vert \
     shaders/triplanaryuvvideo.frag
+
+load(qt_module)

tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro

@@ -1,7 +1,13 @@
 TARGET = mockserviceplugin1
 QT += multimedia-private
 
-PLUGIN_TYPE=mediaservice
+HEADERS += ../mockservice.h
+SOURCES += mockserviceplugin1.cpp
+OTHER_FILES += mockserviceplugin1.json
+
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
+
+PLUGIN_TYPE = mediaservice
 PLUGIN_CLASS_NAME = MockServicePlugin1
 load(qt_plugin)
 
@@ -14,10 +20,4 @@ win32 {
     }
 }
 
-HEADERS += ../mockservice.h
-SOURCES += mockserviceplugin1.cpp
-OTHER_FILES += mockserviceplugin1.json
-
 target.path = $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE}
-
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro

@@ -1,7 +1,13 @@
 TARGET = mockserviceplugin2
 QT += multimedia-private
 
-PLUGIN_TYPE=mediaservice
+HEADERS += ../mockservice.h
+SOURCES += mockserviceplugin2.cpp
+OTHER_FILES += mockserviceplugin2.json
+
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
+
+PLUGIN_TYPE = mediaservice
 PLUGIN_CLASS_NAME = MockServicePlugin2
 load(qt_plugin)
 
@@ -14,10 +20,4 @@ win32 {
     }
 }
 
-HEADERS += ../mockservice.h
-SOURCES += mockserviceplugin2.cpp
-OTHER_FILES += mockserviceplugin2.json
-
 target.path = $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE}
-
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro

@@ -1,7 +1,13 @@
 TARGET = mockserviceplugin3
 QT += multimedia-private
 
-PLUGIN_TYPE=mediaservice
+HEADERS += ../mockservice.h
+SOURCES += mockserviceplugin3.cpp
+OTHER_FILES += mockserviceplugin3.json
+
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
+
+PLUGIN_TYPE = mediaservice
 PLUGIN_CLASS_NAME = MockServicePlugin3
 load(qt_plugin)
 
@@ -14,10 +20,4 @@ win32 {
     }
 }
 
-HEADERS += ../mockservice.h
-SOURCES += mockserviceplugin3.cpp
-OTHER_FILES += mockserviceplugin3.json
-
 target.path = $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE}
-
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro

@@ -1,7 +1,13 @@
 TARGET = mockserviceplugin4
 QT += multimedia-private
 
-PLUGIN_TYPE=mediaservice
+HEADERS += ../mockservice.h
+SOURCES += mockserviceplugin4.cpp
+OTHER_FILES += mockserviceplugin4.json
+
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
+
+PLUGIN_TYPE = mediaservice
 PLUGIN_CLASS_NAME = MockServicePlugin4
 load(qt_plugin)
 
@@ -14,10 +20,4 @@ win32 {
     }
 }
 
-HEADERS += ../mockservice.h
-SOURCES += mockserviceplugin4.cpp
-OTHER_FILES += mockserviceplugin4.json
-
 target.path = $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE}
-
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro

@@ -1,7 +1,13 @@
 TARGET = mockserviceplugin5
 QT += multimedia-private
 
-PLUGIN_TYPE=mediaservice
+HEADERS += ../mockservice.h
+SOURCES += mockserviceplugin5.cpp
+OTHER_FILES += mockserviceplugin5.json
+
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
+
+PLUGIN_TYPE = mediaservice
 PLUGIN_CLASS_NAME = MockServicePlugin5
 load(qt_plugin)
 
@@ -14,10 +20,4 @@ win32 {
     }
 }
 
-HEADERS += ../mockservice.h
-SOURCES += mockserviceplugin5.cpp
-OTHER_FILES += mockserviceplugin5.json
-
 target.path = $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE}
-
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0