From a28364bc1c7144b9c5c383cc5d18d62a68076a38 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Date: Fri, 12 Feb 2016 16:03:42 +0100
Subject: 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: Icbce502dcbcb4d4b4d922c42679f44e2cc930bf3
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
---
 src/plugins/platforms/android/android.pro                     |  7 +++----
 src/plugins/platforms/cocoa/cocoa.pro                         | 10 +++++-----
 src/plugins/platforms/direct2d/direct2d.pro                   | 10 +++++-----
 src/plugins/platforms/directfb/directfb.pro                   | 10 +++++-----
 .../eglfs/deviceintegration/eglfs_brcm/eglfs_brcm.pro         |  8 ++++----
 .../platforms/eglfs/deviceintegration/eglfs_kms/eglfs_kms.pro |  8 ++++----
 .../eglfs_kms_egldevice/eglfs_kms_egldevice.pro               |  8 ++++----
 .../eglfs/deviceintegration/eglfs_mali/eglfs_mali.pro         |  8 ++++----
 .../platforms/eglfs/deviceintegration/eglfs_viv/eglfs_viv.pro |  8 ++++----
 .../eglfs/deviceintegration/eglfs_viv_wl/eglfs_viv_wl.pro     |  8 ++++----
 .../platforms/eglfs/deviceintegration/eglfs_x11/eglfs_x11.pro |  8 ++++----
 src/plugins/platforms/eglfs/eglfs-plugin.pro                  | 10 +++++-----
 src/plugins/platforms/eglfs/eglfs_device_lib.pro              |  4 ++--
 src/plugins/platforms/haiku/haiku.pro                         |  7 ++++---
 src/plugins/platforms/ios/ios.pro                             | 10 +++++-----
 src/plugins/platforms/linuxfb/linuxfb.pro                     | 10 +++++-----
 src/plugins/platforms/minimal/minimal.pro                     | 10 +++++-----
 src/plugins/platforms/minimalegl/minimalegl.pro               | 10 +++++-----
 src/plugins/platforms/mirclient/mirclient.pro                 | 10 +++++-----
 src/plugins/platforms/offscreen/offscreen.pro                 | 10 +++++-----
 src/plugins/platforms/openwfd/openwf.pro                      |  9 ++++-----
 src/plugins/platforms/windows/windows.pro                     | 10 +++++-----
 src/plugins/platforms/winrt/winrt.pro                         | 11 ++++++-----
 src/plugins/platforms/xcb/gl_integrations/xcb_egl/xcb_egl.pro |  9 ++++-----
 src/plugins/platforms/xcb/gl_integrations/xcb_glx/xcb_glx.pro |  9 ++++-----
 src/plugins/platforms/xcb/xcb-plugin.pro                      |  9 ++++-----
 src/plugins/platforms/xcb/xcb_qpa_lib.pro                     |  3 +--
 27 files changed, 115 insertions(+), 119 deletions(-)

(limited to 'src/plugins/platforms')

diff --git a/src/plugins/platforms/android/android.pro b/src/plugins/platforms/android/android.pro
index 3ba817bf5b..045e55ec65 100644
--- a/src/plugins/platforms/android/android.pro
+++ b/src/plugins/platforms/android/android.pro
@@ -1,13 +1,9 @@
 TARGET = qtforandroid
 
-PLUGIN_TYPE = platforms
-
 # STATICPLUGIN needed because there's a Q_IMPORT_PLUGIN in androidjnimain.cpp
 # Yes, the plugin imports itself statically
 DEFINES += QT_STATICPLUGIN
 
-load(qt_plugin)
-
 LIBS += -ljnigraphics -landroid
 
 QT += core-private gui-private platformsupport-private
@@ -79,6 +75,9 @@ HEADERS += $$PWD/qandroidplatformintegration.h \
 android-style-assets: SOURCES += $$PWD/extract.cpp
 else: SOURCES += $$PWD/extract-dummy.cpp
 
+PLUGIN_TYPE = platforms
+load(qt_plugin)
+
 #Non-standard install directory, QTBUG-29859
 DESTDIR = $$DESTDIR/android
 target.path = $${target.path}/android
diff --git a/src/plugins/platforms/cocoa/cocoa.pro b/src/plugins/platforms/cocoa/cocoa.pro
index ba0e6b001a..05d0bb4094 100644
--- a/src/plugins/platforms/cocoa/cocoa.pro
+++ b/src/plugins/platforms/cocoa/cocoa.pro
@@ -1,10 +1,5 @@
 TARGET = qcocoa
 
-PLUGIN_TYPE = platforms
-PLUGIN_CLASS_NAME = QCocoaIntegrationPlugin
-!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
-load(qt_plugin)
-
 OBJECTIVE_SOURCES += main.mm \
     qcocoaintegration.mm \
     qcocoatheme.mm \
@@ -112,3 +107,8 @@ OTHER_FILES += cocoa.json
 
 # Window debug support
 #DEFINES += QT_COCOA_ENABLE_WINDOW_DEBUG
+
+PLUGIN_TYPE = platforms
+PLUGIN_CLASS_NAME = QCocoaIntegrationPlugin
+!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
+load(qt_plugin)
diff --git a/src/plugins/platforms/direct2d/direct2d.pro b/src/plugins/platforms/direct2d/direct2d.pro
index 8f2ccc3aa6..005a4da6db 100644
--- a/src/plugins/platforms/direct2d/direct2d.pro
+++ b/src/plugins/platforms/direct2d/direct2d.pro
@@ -1,10 +1,5 @@
 TARGET = qdirect2d
 
-PLUGIN_TYPE = platforms
-PLUGIN_CLASS_NAME = QWindowsDirect2DIntegrationPlugin
-!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
-load(qt_plugin)
-
 QT *= core-private
 QT *= gui-private
 QT *= platformsupport-private
@@ -40,3 +35,8 @@ HEADERS += \
     qwindowsdirect2dwindow.h
 
 OTHER_FILES += direct2d.json
+
+PLUGIN_TYPE = platforms
+PLUGIN_CLASS_NAME = QWindowsDirect2DIntegrationPlugin
+!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
+load(qt_plugin)
diff --git a/src/plugins/platforms/directfb/directfb.pro b/src/plugins/platforms/directfb/directfb.pro
index 89d8d42cea..5c81e0283a 100644
--- a/src/plugins/platforms/directfb/directfb.pro
+++ b/src/plugins/platforms/directfb/directfb.pro
@@ -1,10 +1,5 @@
 TARGET = qdirectfb
 
-PLUGIN_TYPE = platforms
-PLUGIN_CLASS_NAME = QDirectFbIntegrationPlugin
-!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
-load(qt_plugin)
-
 QT += core-private gui-private platformsupport-private
 
 LIBS += $$QMAKE_LIBS_DIRECTFB
@@ -51,3 +46,8 @@ contains(QT_CONFIG, directfb_egl) {
 CONFIG += qpa/genericunixfontdatabase
 
 OTHER_FILES += directfb.json
+
+PLUGIN_TYPE = platforms
+PLUGIN_CLASS_NAME = QDirectFbIntegrationPlugin
+!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
+load(qt_plugin)
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_brcm/eglfs_brcm.pro b/src/plugins/platforms/eglfs/deviceintegration/eglfs_brcm/eglfs_brcm.pro
index 2026b6a6c6..e2ebf9f7ee 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_brcm/eglfs_brcm.pro
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_brcm/eglfs_brcm.pro
@@ -1,9 +1,5 @@
 TARGET = qeglfs-brcm-integration
 
-PLUGIN_TYPE = egldeviceintegrations
-PLUGIN_CLASS_NAME = QEglFSBrcmIntegrationPlugin
-load(qt_plugin)
-
 QT += core-private gui-private platformsupport-private eglfs_device_lib-private
 
 INCLUDEPATH += $$PWD/../..
@@ -21,3 +17,7 @@ SOURCES += $$PWD/qeglfsbrcmmain.cpp \
 HEADERS += $$PWD/qeglfsbrcmintegration.h
 
 OTHER_FILES += $$PWD/eglfs_brcm.json
+
+PLUGIN_TYPE = egldeviceintegrations
+PLUGIN_CLASS_NAME = QEglFSBrcmIntegrationPlugin
+load(qt_plugin)
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/eglfs_kms.pro b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/eglfs_kms.pro
index e53793ce54..12ae0a13b1 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/eglfs_kms.pro
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/eglfs_kms.pro
@@ -1,9 +1,5 @@
 TARGET = qeglfs-kms-integration
 
-PLUGIN_TYPE = egldeviceintegrations
-PLUGIN_CLASS_NAME = QEglFSKmsIntegrationPlugin
-load(qt_plugin)
-
 QT += core-private gui-private platformsupport-private eglfs_device_lib-private
 
 INCLUDEPATH += $$PWD/../..
@@ -29,3 +25,7 @@ HEADERS += $$PWD/qeglfskmsintegration.h \
            $$PWD/qeglfskmscursor.h
 
 OTHER_FILES += $$PWD/eglfs_kms.json
+
+PLUGIN_TYPE = egldeviceintegrations
+PLUGIN_CLASS_NAME = QEglFSKmsIntegrationPlugin
+load(qt_plugin)
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/eglfs_kms_egldevice.pro b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/eglfs_kms_egldevice.pro
index 393ddd14a5..1932f861b9 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/eglfs_kms_egldevice.pro
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/eglfs_kms_egldevice.pro
@@ -1,9 +1,5 @@
 TARGET = qeglfs-kms-egldevice-integration
 
-PLUGIN_TYPE = egldeviceintegrations
-PLUGIN_CLASS_NAME = QEglFSKmsEglDeviceIntegrationPlugin
-load(qt_plugin)
-
 QT += core-private gui-private platformsupport-private eglfs_device_lib-private
 
 INCLUDEPATH += $$PWD/../..
@@ -21,3 +17,7 @@ HEADERS += $$PWD/qeglfskmsegldeviceintegration.h
 OTHER_FILES += $$PWD/eglfs_kms_egldevice.json
 
 LIBS += -ldrm
+
+PLUGIN_TYPE = egldeviceintegrations
+PLUGIN_CLASS_NAME = QEglFSKmsEglDeviceIntegrationPlugin
+load(qt_plugin)
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/eglfs_mali.pro b/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/eglfs_mali.pro
index 33f219db96..7fc4568ae3 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/eglfs_mali.pro
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/eglfs_mali.pro
@@ -1,9 +1,5 @@
 TARGET = qeglfs-mali-integration
 
-PLUGIN_TYPE = egldeviceintegrations
-PLUGIN_CLASS_NAME = QEglFSMaliIntegrationPlugin
-load(qt_plugin)
-
 QT += core-private gui-private platformsupport-private eglfs_device_lib-private
 
 # Avoid X11 header collision
@@ -19,3 +15,7 @@ SOURCES += $$PWD/qeglfsmalimain.cpp \
 HEADERS += $$PWD/qeglfsmaliintegration.h
 
 OTHER_FILES += $$PWD/eglfs_mali.json
+
+PLUGIN_TYPE = egldeviceintegrations
+PLUGIN_CLASS_NAME = QEglFSMaliIntegrationPlugin
+load(qt_plugin)
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv/eglfs_viv.pro b/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv/eglfs_viv.pro
index fc0533127c..6fac2f529a 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv/eglfs_viv.pro
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv/eglfs_viv.pro
@@ -1,9 +1,5 @@
 TARGET = qeglfs-viv-integration
 
-PLUGIN_TYPE = egldeviceintegrations
-PLUGIN_CLASS_NAME = QEglFSVivIntegrationPlugin
-load(qt_plugin)
-
 QT += core-private gui-private platformsupport-private eglfs_device_lib-private
 
 INCLUDEPATH += $$PWD/../..
@@ -18,3 +14,7 @@ SOURCES += $$PWD/qeglfsvivmain.cpp \
 HEADERS += $$PWD/qeglfsvivintegration.h
 
 OTHER_FILES += $$PWD/eglfs_viv.json
+
+PLUGIN_TYPE = egldeviceintegrations
+PLUGIN_CLASS_NAME = QEglFSVivIntegrationPlugin
+load(qt_plugin)
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv_wl/eglfs_viv_wl.pro b/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv_wl/eglfs_viv_wl.pro
index 26b6a2e9ea..44f75c40e0 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv_wl/eglfs_viv_wl.pro
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv_wl/eglfs_viv_wl.pro
@@ -1,9 +1,5 @@
 TARGET = qeglfs-viv-wl-integration
 
-PLUGIN_TYPE = egldeviceintegrations
-PLUGIN_CLASS_NAME = QEglFSVivWaylandIntegrationPlugin
-load(qt_plugin)
-
 QT += core-private gui-private platformsupport-private eglfs_device_lib-private
 
 INCLUDEPATH += $$PWD/../..
@@ -21,3 +17,7 @@ OTHER_FILES += $$PWD/eglfs_viv_wl.json
 
 CONFIG += link_pkgconfig
 PKGCONFIG_PRIVATE += wayland-server
+
+PLUGIN_TYPE = egldeviceintegrations
+PLUGIN_CLASS_NAME = QEglFSVivWaylandIntegrationPlugin
+load(qt_plugin)
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/eglfs_x11.pro b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/eglfs_x11.pro
index 86fefac8aa..83f0c74910 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/eglfs_x11.pro
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/eglfs_x11.pro
@@ -1,9 +1,5 @@
 TARGET = qeglfs-x11-integration
 
-PLUGIN_TYPE = egldeviceintegrations
-PLUGIN_CLASS_NAME = QEglFSX11IntegrationPlugin
-load(qt_plugin)
-
 QT += core-private gui-private platformsupport-private eglfs_device_lib-private
 
 # Avoid X11 header collision
@@ -21,3 +17,7 @@ SOURCES += $$PWD/qeglfsx11main.cpp \
 HEADERS += $$PWD/qeglfsx11integration.h
 
 OTHER_FILES += $$PWD/eglfs_x11.json
+
+PLUGIN_TYPE = egldeviceintegrations
+PLUGIN_CLASS_NAME = QEglFSX11IntegrationPlugin
+load(qt_plugin)
diff --git a/src/plugins/platforms/eglfs/eglfs-plugin.pro b/src/plugins/platforms/eglfs/eglfs-plugin.pro
index 0f493fdc01..a628cdccd9 100644
--- a/src/plugins/platforms/eglfs/eglfs-plugin.pro
+++ b/src/plugins/platforms/eglfs/eglfs-plugin.pro
@@ -1,12 +1,12 @@
 TARGET = qeglfs
 
-PLUGIN_TYPE = platforms
-PLUGIN_CLASS_NAME = QEglFSIntegrationPlugin
-!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
-load(qt_plugin)
-
 QT += platformsupport-private eglfs_device_lib-private
 
 SOURCES += $$PWD/qeglfsmain.cpp
 
 OTHER_FILES += $$PWD/eglfs.json
+
+PLUGIN_TYPE = platforms
+PLUGIN_CLASS_NAME = QEglFSIntegrationPlugin
+!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
+load(qt_plugin)
diff --git a/src/plugins/platforms/eglfs/eglfs_device_lib.pro b/src/plugins/platforms/eglfs/eglfs_device_lib.pro
index 4fe2ce4897..f784020fb6 100644
--- a/src/plugins/platforms/eglfs/eglfs_device_lib.pro
+++ b/src/plugins/platforms/eglfs/eglfs_device_lib.pro
@@ -6,8 +6,6 @@
 TARGET = QtEglDeviceIntegration
 CONFIG += no_module_headers internal_module
 
-load(qt_module)
-
 QT += core-private gui-private platformsupport-private
 LIBS += $$QMAKE_LIBS_DYNLOAD
 
@@ -52,3 +50,5 @@ INCLUDEPATH += $$PWD
 CONFIG += egl qpa/genericunixfontdatabase
 
 !contains(DEFINES, QT_NO_CURSOR): RESOURCES += $$PWD/cursor.qrc
+
+load(qt_module)
diff --git a/src/plugins/platforms/haiku/haiku.pro b/src/plugins/platforms/haiku/haiku.pro
index 87f31997a3..ea5bb632db 100644
--- a/src/plugins/platforms/haiku/haiku.pro
+++ b/src/plugins/platforms/haiku/haiku.pro
@@ -1,7 +1,4 @@
 TARGET = qhaiku
-PLUGIN_TYPE = platforms
-PLUGIN_CLASS_NAME = QHaikuIntegrationPlugin
-load(qt_plugin)
 
 QT += platformsupport-private core-private gui-private
 
@@ -40,3 +37,7 @@ LIBS += -lbe
 OTHER_FILES += haiku.json
 
 include (../../../platformsupport/fontdatabases/fontdatabases.pri)
+
+PLUGIN_TYPE = platforms
+PLUGIN_CLASS_NAME = QHaikuIntegrationPlugin
+load(qt_plugin)
diff --git a/src/plugins/platforms/ios/ios.pro b/src/plugins/platforms/ios/ios.pro
index bf7849b740..545db8c093 100644
--- a/src/plugins/platforms/ios/ios.pro
+++ b/src/plugins/platforms/ios/ios.pro
@@ -1,10 +1,5 @@
 TARGET = qios
 
-PLUGIN_TYPE = platforms
-PLUGIN_CLASS_NAME = QIOSIntegrationPlugin
-!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
-load(qt_plugin)
-
 QT += core-private gui-private platformsupport-private
 LIBS += -framework Foundation -framework UIKit -framework QuartzCore -framework AssetsLibrary
 
@@ -59,3 +54,8 @@ HEADERS = \
 OTHER_FILES = \
     quiview_textinput.mm \
     quiview_accessibility.mm
+
+PLUGIN_TYPE = platforms
+PLUGIN_CLASS_NAME = QIOSIntegrationPlugin
+!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
+load(qt_plugin)
diff --git a/src/plugins/platforms/linuxfb/linuxfb.pro b/src/plugins/platforms/linuxfb/linuxfb.pro
index 389d45c29c..b5de192346 100644
--- a/src/plugins/platforms/linuxfb/linuxfb.pro
+++ b/src/plugins/platforms/linuxfb/linuxfb.pro
@@ -1,10 +1,5 @@
 TARGET = qlinuxfb
 
-PLUGIN_TYPE = platforms
-PLUGIN_CLASS_NAME = QLinuxFbIntegrationPlugin
-!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
-load(qt_plugin)
-
 QT += core-private gui-private platformsupport-private
 
 SOURCES = main.cpp qlinuxfbintegration.cpp qlinuxfbscreen.cpp
@@ -13,3 +8,8 @@ HEADERS = qlinuxfbintegration.h qlinuxfbscreen.h
 CONFIG += qpa/genericunixfontdatabase
 
 OTHER_FILES += linuxfb.json
+
+PLUGIN_TYPE = platforms
+PLUGIN_CLASS_NAME = QLinuxFbIntegrationPlugin
+!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
+load(qt_plugin)
diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro
index 3ed4d2cdde..d6914026ae 100644
--- a/src/plugins/platforms/minimal/minimal.pro
+++ b/src/plugins/platforms/minimal/minimal.pro
@@ -1,10 +1,5 @@
 TARGET = qminimal
 
-PLUGIN_TYPE = platforms
-PLUGIN_CLASS_NAME = QMinimalIntegrationPlugin
-!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
-load(qt_plugin)
-
 QT += core-private gui-private platformsupport-private
 
 SOURCES =   main.cpp \
@@ -14,3 +9,8 @@ HEADERS =   qminimalintegration.h \
             qminimalbackingstore.h
 
 OTHER_FILES += minimal.json
+
+PLUGIN_TYPE = platforms
+PLUGIN_CLASS_NAME = QMinimalIntegrationPlugin
+!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
+load(qt_plugin)
diff --git a/src/plugins/platforms/minimalegl/minimalegl.pro b/src/plugins/platforms/minimalegl/minimalegl.pro
index e78dcb8bc5..ac67249591 100644
--- a/src/plugins/platforms/minimalegl/minimalegl.pro
+++ b/src/plugins/platforms/minimalegl/minimalegl.pro
@@ -1,10 +1,5 @@
 TARGET = qminimalegl
 
-PLUGIN_TYPE = platforms
-PLUGIN_CLASS_NAME = QMinimalEglIntegrationPlugin
-!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
-load(qt_plugin)
-
 QT += core-private gui-private platformsupport-private
 
 #DEFINES += QEGL_EXTRA_DEBUG
@@ -29,3 +24,8 @@ CONFIG += egl qpa/genericunixfontdatabase
 
 OTHER_FILES += \
     minimalegl.json
+
+PLUGIN_TYPE = platforms
+PLUGIN_CLASS_NAME = QMinimalEglIntegrationPlugin
+!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
+load(qt_plugin)
diff --git a/src/plugins/platforms/mirclient/mirclient.pro b/src/plugins/platforms/mirclient/mirclient.pro
index 0851e8d719..4ea5593478 100644
--- a/src/plugins/platforms/mirclient/mirclient.pro
+++ b/src/plugins/platforms/mirclient/mirclient.pro
@@ -1,11 +1,6 @@
 TARGET = mirclient
 TEMPLATE = lib
 
-PLUGIN_TYPE = platforms
-PLUGIN_CLASS_NAME = MirServerIntegrationPlugin
-!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
-load(qt_plugin)
-
 QT += core-private gui-private platformsupport-private dbus
 
 CONFIG += qpa/genericunixfontdatabase
@@ -47,3 +42,8 @@ HEADERS = \
     qmirclientscreen.h \
     qmirclienttheme.h \
     qmirclientwindow.h
+
+PLUGIN_TYPE = platforms
+PLUGIN_CLASS_NAME = MirServerIntegrationPlugin
+!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
+load(qt_plugin)
diff --git a/src/plugins/platforms/offscreen/offscreen.pro b/src/plugins/platforms/offscreen/offscreen.pro
index 94eeac6acc..999550a7e1 100644
--- a/src/plugins/platforms/offscreen/offscreen.pro
+++ b/src/plugins/platforms/offscreen/offscreen.pro
@@ -1,10 +1,5 @@
 TARGET = qoffscreen
 
-PLUGIN_TYPE = platforms
-PLUGIN_CLASS_NAME = QOffscreenIntegrationPlugin
-!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
-load(qt_plugin)
-
 QT += core-private gui-private platformsupport-private
 
 SOURCES =   main.cpp \
@@ -25,3 +20,8 @@ contains(QT_CONFIG, xlib):contains(QT_CONFIG, opengl):!contains(QT_CONFIG, openg
 } else {
     SOURCES += qoffscreenintegration_dummy.cpp
 }
+
+PLUGIN_TYPE = platforms
+PLUGIN_CLASS_NAME = QOffscreenIntegrationPlugin
+!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
+load(qt_plugin)
diff --git a/src/plugins/platforms/openwfd/openwf.pro b/src/plugins/platforms/openwfd/openwf.pro
index 38bac057bd..152e4f57d7 100644
--- a/src/plugins/platforms/openwfd/openwf.pro
+++ b/src/plugins/platforms/openwfd/openwf.pro
@@ -1,10 +1,5 @@
 TARGET = qopenwf
 
-PLUGIN_TYPE = platforms
-PLUGIN_CLASS_NAME = QOpenWFDIntegrationPlugin
-!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
-load(qt_plugin)
-
 QT += core-private gui-private platformsupport-private
 
 CONFIG += qpa/genericunixfontdatabase
@@ -38,3 +33,7 @@ SOURCES += \
 
 LIBS += -lWFD -lgbm -lGLESv2 -lEGL
 
+PLUGIN_TYPE = platforms
+PLUGIN_CLASS_NAME = QOpenWFDIntegrationPlugin
+!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
+load(qt_plugin)
diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro
index cc0373c077..2e0f723693 100644
--- a/src/plugins/platforms/windows/windows.pro
+++ b/src/plugins/platforms/windows/windows.pro
@@ -1,10 +1,5 @@
 TARGET = qwindows
 
-PLUGIN_TYPE = platforms
-PLUGIN_CLASS_NAME = QWindowsIntegrationPlugin
-!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
-load(qt_plugin)
-
 QT *= core-private
 QT *= gui-private
 QT *= platformsupport-private
@@ -25,3 +20,8 @@ HEADERS +=  \
     qwindowsgdinativeinterface.h
 
 OTHER_FILES += windows.json
+
+PLUGIN_TYPE = platforms
+PLUGIN_CLASS_NAME = QWindowsIntegrationPlugin
+!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
+load(qt_plugin)
diff --git a/src/plugins/platforms/winrt/winrt.pro b/src/plugins/platforms/winrt/winrt.pro
index 991ec1789b..261295ef0b 100644
--- a/src/plugins/platforms/winrt/winrt.pro
+++ b/src/plugins/platforms/winrt/winrt.pro
@@ -1,10 +1,6 @@
 TARGET = qwinrt
-CONFIG -= precompile_header
 
-PLUGIN_TYPE = platforms
-PLUGIN_CLASS_NAME = QWinRTIntegrationPlugin
-!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
-load(qt_plugin)
+CONFIG -= precompile_header
 
 QT += core-private gui-private platformsupport-private
 
@@ -50,3 +46,8 @@ HEADERS = \
     qwinrtwindow.h
 
 OTHER_FILES += winrt.json
+
+PLUGIN_TYPE = platforms
+PLUGIN_CLASS_NAME = QWinRTIntegrationPlugin
+!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
+load(qt_plugin)
diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/xcb_egl.pro b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/xcb_egl.pro
index 28a572a2c9..6d52332bad 100644
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/xcb_egl.pro
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/xcb_egl.pro
@@ -1,10 +1,5 @@
 TARGET = qxcb-egl-integration
 
-PLUGIN_CLASS_NAME = QXcbEglIntegrationPlugin
-PLUGIN_TYPE = xcbglintegrations
-
-load(qt_plugin)
-
 include(../gl_integrations_plugin_base.pri)
 
 CONFIG += egl
@@ -22,3 +17,7 @@ SOURCES += \
     qxcbeglwindow.cpp \
     qxcbeglmain.cpp \
     qxcbeglnativeinterfacehandler.cpp
+
+PLUGIN_CLASS_NAME = QXcbEglIntegrationPlugin
+PLUGIN_TYPE = xcbglintegrations
+load(qt_plugin)
diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/xcb_glx.pro b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/xcb_glx.pro
index 1c577e5dc9..67fd68765a 100644
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/xcb_glx.pro
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/xcb_glx.pro
@@ -1,10 +1,5 @@
 TARGET = qxcb-glx-integration
 
-PLUGIN_CLASS_NAME = QXcbGlxIntegrationPlugin
-PLUGIN_TYPE = xcbglintegrations
-
-load(qt_plugin)
-
 include(../gl_integrations_plugin_base.pri)
 
 #should be removed from the sources
@@ -31,3 +26,7 @@ SOURCES += \
     qxcbglxwindow.cpp \
     qglxintegration.cpp \
     qxcbglxnativeinterfacehandler.cpp
+
+PLUGIN_CLASS_NAME = QXcbGlxIntegrationPlugin
+PLUGIN_TYPE = xcbglintegrations
+load(qt_plugin)
diff --git a/src/plugins/platforms/xcb/xcb-plugin.pro b/src/plugins/platforms/xcb/xcb-plugin.pro
index 09ab1ad77a..75684a769b 100644
--- a/src/plugins/platforms/xcb/xcb-plugin.pro
+++ b/src/plugins/platforms/xcb/xcb-plugin.pro
@@ -1,13 +1,12 @@
 TARGET = qxcb
 
-PLUGIN_TYPE = platforms
-PLUGIN_CLASS_NAME = QXcbIntegrationPlugin
-!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
-load(qt_plugin)
-
 QT += core-private gui-private platformsupport-private xcb_qpa_lib-private
 
 SOURCES = \
     qxcbmain.cpp
 OTHER_FILES += xcb.json README
 
+PLUGIN_TYPE = platforms
+PLUGIN_CLASS_NAME = QXcbIntegrationPlugin
+!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
+load(qt_plugin)
diff --git a/src/plugins/platforms/xcb/xcb_qpa_lib.pro b/src/plugins/platforms/xcb/xcb_qpa_lib.pro
index 302d87e007..f4a4e5a78a 100644
--- a/src/plugins/platforms/xcb/xcb_qpa_lib.pro
+++ b/src/plugins/platforms/xcb/xcb_qpa_lib.pro
@@ -1,8 +1,6 @@
 TARGET     = QtXcbQpa
 CONFIG += no_module_headers internal_module
 
-load(qt_module)
-
 QT += core-private gui-private platformsupport-private
 
 SOURCES = \
@@ -105,3 +103,4 @@ contains(QT_CONFIG, xkbcommon-qt) {
     QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XKBCOMMON
 }
 
+load(qt_module)
-- 
cgit v1.2.3