11 files changed, 19 insertions, 45 deletions
diff --git a/src/plugins/platforms/cocoa/cocoa.pro b/src/plugins/platforms/cocoa/cocoa.pro
index 106664a6b0..3ea5dc2d1c 100644
--- a/src/plugins/platforms/cocoa/cocoa.pro
+++ b/src/plugins/platforms/cocoa/cocoa.pro
@@ -1,6 +1,7 @@
 TARGET = qcocoa
+
+PLUGIN_TYPE = platforms
 load(qt_plugin)
-DESTDIR = $$QT.gui.plugins/platforms
 
 OBJECTIVE_SOURCES += main.mm \
     qcocoaintegration.mm \
@@ -91,8 +92,6 @@ QT += core-private gui-private platformsupport-private
 }
 
 OTHER_FILES += cocoa.json
-target.path += $$[QT_INSTALL_PLUGINS]/platforms
-INSTALLS += target
 
 # Build the release libqcocoa.dylib only, skip the debug version.
 # The Qt plugin loader will dlopen both if found, causing duplicate
diff --git a/src/plugins/platforms/directfb/directfb.pro b/src/plugins/platforms/directfb/directfb.pro
index 85821662a0..29c5ebd99b 100644
--- a/src/plugins/platforms/directfb/directfb.pro
+++ b/src/plugins/platforms/directfb/directfb.pro
@@ -1,6 +1,7 @@
 TARGET = qdirectfb
+
+PLUGIN_TYPE = platforms
 load(qt_plugin)
-DESTDIR = $$QT.gui.plugins/platforms
 
 QT += core-private gui-private platformsupport-private
 
@@ -46,7 +47,5 @@ contains(QT_CONFIG, directfb_egl) {
 
 
 CONFIG += qpa/genericunixfontdatabase
-target.path += $$[QT_INSTALL_PLUGINS]/platforms
-INSTALLS += target
 
 OTHER_FILES += directfb.json
diff --git a/src/plugins/platforms/eglfs/eglfs.pro b/src/plugins/platforms/eglfs/eglfs.pro
index f22ccc55d2..1223b6b133 100644
--- a/src/plugins/platforms/eglfs/eglfs.pro
+++ b/src/plugins/platforms/eglfs/eglfs.pro
@@ -1,10 +1,10 @@
 TARGET = qeglfs
+
+PLUGIN_TYPE = platforms
 load(qt_plugin)
 
 QT += core-private gui-private platformsupport-private
 
-DESTDIR = $$QT.gui.plugins/platforms
-
 #DEFINES += QEGL_EXTRA_DEBUG
 
 #Avoid X11 header collision
@@ -44,9 +44,6 @@ INCLUDEPATH += $$PWD
 
 CONFIG += egl qpa/genericunixfontdatabase
 
-target.path += $$[QT_INSTALL_PLUGINS]/platforms
-INSTALLS += target
-
 RESOURCES += cursor.qrc
 
 OTHER_FILES += \
diff --git a/src/plugins/platforms/kms/kms.pro b/src/plugins/platforms/kms/kms.pro
index 2e8af5ba9d..57191d8d97 100644
--- a/src/plugins/platforms/kms/kms.pro
+++ b/src/plugins/platforms/kms/kms.pro
@@ -1,8 +1,9 @@
 TARGET = qkms
+
+PLUGIN_TYPE = platforms
 load(qt_plugin)
 
 QT += core-private gui-private platformsupport-private opengl-private
-DESTDIR = $$QT.gui.plugins/platforms
 
 DEFINES += MESA_EGL_NO_X11_HEADERS
 
@@ -36,8 +37,5 @@ HEADERS =   qkmsintegration.h \
             qkmsudevdrmhandler.h \
             qkmsvthandler.h
 
-target.path += $$[QT_INSTALL_PLUGINS]/platforms
-INSTALLS += target
-
 OTHER_FILES += \
     kms.json
diff --git a/src/plugins/platforms/linuxfb/linuxfb.pro b/src/plugins/platforms/linuxfb/linuxfb.pro
index 9834dea7d5..2482a64469 100644
--- a/src/plugins/platforms/linuxfb/linuxfb.pro
+++ b/src/plugins/platforms/linuxfb/linuxfb.pro
@@ -1,7 +1,7 @@
 TARGET = qlinuxfb
-load(qt_plugin)
 
-DESTDIR = $$QT.gui.plugins/platforms
+PLUGIN_TYPE = platforms
+load(qt_plugin)
 
 QT += core-private gui-private platformsupport-private
 
@@ -10,7 +10,4 @@ HEADERS = qlinuxfbintegration.h qlinuxfbscreen.h
 
 CONFIG += qpa/genericunixfontdatabase
 
-target.path += $$[QT_INSTALL_PLUGINS]/platforms
-INSTALLS += target
-
 OTHER_FILES += linuxfb.json
diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro
index 6430ccde75..9c3d37269c 100644
--- a/src/plugins/platforms/minimal/minimal.pro
+++ b/src/plugins/platforms/minimal/minimal.pro
@@ -1,8 +1,9 @@
 TARGET = qminimal
+
+PLUGIN_TYPE = platforms
 load(qt_plugin)
 
 QT += core-private gui-private platformsupport-private
-DESTDIR = $$QT.gui.plugins/platforms
 
 SOURCES =   main.cpp \
             qminimalintegration.cpp \
@@ -11,6 +12,3 @@ HEADERS =   qminimalintegration.h \
             qminimalbackingstore.h
 
 OTHER_FILES += minimal.json
-
-target.path += $$[QT_INSTALL_PLUGINS]/platforms
-INSTALLS += target
diff --git a/src/plugins/platforms/minimalegl/minimalegl.pro b/src/plugins/platforms/minimalegl/minimalegl.pro
index 22e3729ed7..23a6ad9708 100644
--- a/src/plugins/platforms/minimalegl/minimalegl.pro
+++ b/src/plugins/platforms/minimalegl/minimalegl.pro
@@ -1,10 +1,10 @@
 TARGET = qminimalegl
+
+PLUGIN_TYPE = platforms
 load(qt_plugin)
 
 QT += core-private gui-private platformsupport-private
 
-DESTDIR = $$QT.gui.plugins/platforms
-
 #DEFINES += QEGL_EXTRA_DEBUG
 
 #DEFINES += Q_OPENKODE
@@ -25,8 +25,5 @@ HEADERS =   qminimaleglintegration.h \
 
 CONFIG += egl qpa/genericunixfontdatabase
 
-target.path += $$[QT_INSTALL_PLUGINS]/platforms
-INSTALLS += target
-
 OTHER_FILES += \
     minimalegl.json
diff --git a/src/plugins/platforms/openwfd/openwf.pro b/src/plugins/platforms/openwfd/openwf.pro
index d913a84411..1b177cba04 100644
--- a/src/plugins/platforms/openwfd/openwf.pro
+++ b/src/plugins/platforms/openwfd/openwf.pro
@@ -1,7 +1,7 @@
 TARGET = qopenwf
 
+PLUGIN_TYPE = platforms
 load(qt_plugin)
-QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms
 
 QT += core-private gui-private platformsupport-private
 
@@ -36,6 +36,3 @@ SOURCES += \
 
 LIBS += -lWFD -lgbm -lGLESv2 -lEGL
 
-target.path += $$[QT_INSTALL_PLUGINS]/platforms
-INSTALLS += target
-
diff --git a/src/plugins/platforms/qnx/qnx.pro b/src/plugins/platforms/qnx/qnx.pro
index 6c13be5965..30c95b1620 100644
--- a/src/plugins/platforms/qnx/qnx.pro
+++ b/src/plugins/platforms/qnx/qnx.pro
@@ -1,6 +1,5 @@
 TARGET = qnx
 
-QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms
 QT += platformsupport platformsupport-private
 
 # Uncomment this to build with support for IMF once it becomes available in the BBNDK
@@ -137,7 +136,5 @@ QMAKE_CXXFLAGS += -I./private
 include (../../../platformsupport/eglconvenience/eglconvenience.pri)
 include (../../../platformsupport/fontdatabases/fontdatabases.pri)
 
-target.path += $$[QT_INSTALL_PLUGINS]/platforms
-INSTALLS += target
-
+PLUGIN_TYPE = platforms
 load(qt_plugin)
diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro
index 1527f0e496..ca356e1276 100644
--- a/src/plugins/platforms/windows/windows.pro
+++ b/src/plugins/platforms/windows/windows.pro
@@ -1,4 +1,6 @@
 TARGET = windows
+
+PLUGIN_TYPE = platforms
 load(qt_plugin)
 
 QT *= core-private
@@ -6,7 +8,6 @@ QT *= gui-private
 QT *= platformsupport-private
 
 INCLUDEPATH += ../../../3rdparty/harfbuzz/src
-QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms
 
 # Note: OpenGL32 must precede Gdi32 as it overwrites some functions.
 LIBS *= -lole32
@@ -172,6 +173,3 @@ contains(QT_CONFIG, freetype) {
 OTHER_FILES += windows.json
 
 contains(QT_CONFIG, accessibility):include(accessible/accessible.pri)
-
-target.path += $$[QT_INSTALL_PLUGINS]/platforms
-INSTALLS += target
diff --git a/src/plugins/platforms/xcb/xcb.pro b/src/plugins/platforms/xcb/xcb.pro
index 58521686aa..34f7c74675 100644
--- a/src/plugins/platforms/xcb/xcb.pro
+++ b/src/plugins/platforms/xcb/xcb.pro
@@ -1,7 +1,7 @@
 TARGET = xcb
 
+PLUGIN_TYPE = platforms
 load(qt_plugin)
-QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms
 
 QT += core-private gui-private platformsupport-private
 
@@ -110,6 +110,3 @@ LIBS += -ldbus-1
 }
 
 OTHER_FILES += xcb.json
-
-target.path += $$[QT_INSTALL_PLUGINS]/platforms
-INSTALLS += target