From 8c39b4c05fecf1e0c1713c19b5e077c47e881846 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 24 Oct 2012 14:00:12 +0200 Subject: beef up qt_plugin.prf it now defines the DESTDIR and creates an INSTALLS rule. Change-Id: I15a462ccad9acbe3521c352fa98327825dc27c05 Reviewed-by: Joerg Bornemann --- mkspecs/features/qt_plugin.prf | 13 +++++++++++-- src/plugins/accessible/qaccessiblebase.pri | 2 -- src/plugins/accessible/widgets/widgets.pro | 4 ++-- src/plugins/bearer/blackberry/blackberry.pro | 6 ++---- src/plugins/bearer/connman/connman.pro | 6 ++---- src/plugins/bearer/corewlan/corewlan.pro | 6 ++---- src/plugins/bearer/generic/generic.pro | 6 ++---- src/plugins/bearer/nativewifi/nativewifi.pro | 6 ++---- src/plugins/bearer/networkmanager/networkmanager.pro | 6 ++---- src/plugins/bearer/nla/nla.pro | 6 ++---- src/plugins/generic/evdevkeyboard/evdevkeyboard.pro | 6 ++---- src/plugins/generic/evdevmouse/evdevmouse.pro | 6 ++---- src/plugins/generic/evdevtablet/evdevtablet.pro | 6 ++---- src/plugins/generic/evdevtouch/evdevtouch.pro | 6 ++---- src/plugins/generic/meego/meego.pro | 7 ++----- src/plugins/generic/tslib/tslib.pro | 6 ++---- src/plugins/imageformats/gif/gif.pro | 6 ++---- src/plugins/imageformats/ico/ico.pro | 6 ++---- src/plugins/imageformats/jpeg/jpeg.pro | 6 ++---- src/plugins/platforminputcontexts/ibus/ibus.pro | 7 ++----- src/plugins/platforminputcontexts/maliit/maliit.pro | 7 ++----- src/plugins/platforms/cocoa/cocoa.pro | 5 ++--- src/plugins/platforms/directfb/directfb.pro | 5 ++--- src/plugins/platforms/eglfs/eglfs.pro | 7 ++----- src/plugins/platforms/kms/kms.pro | 6 ++---- src/plugins/platforms/linuxfb/linuxfb.pro | 7 ++----- src/plugins/platforms/minimal/minimal.pro | 6 ++---- src/plugins/platforms/minimalegl/minimalegl.pro | 7 ++----- src/plugins/platforms/openwfd/openwf.pro | 5 +---- src/plugins/platforms/qnx/qnx.pro | 5 +---- src/plugins/platforms/windows/windows.pro | 6 ++---- src/plugins/platforms/xcb/xcb.pro | 5 +---- src/plugins/printsupport/cocoa/cocoa.pro | 6 ++---- src/plugins/printsupport/cups/cups.pro | 6 ++---- src/plugins/printsupport/windows/windows.pro | 5 ++--- src/plugins/sqldrivers/qsqldriverbase.pri | 6 ++---- 36 files changed, 76 insertions(+), 141 deletions(-) delete mode 100644 src/plugins/accessible/qaccessiblebase.pri diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf index b6036dda42..363664bb67 100644 --- a/mkspecs/features/qt_plugin.prf +++ b/mkspecs/features/qt_plugin.prf @@ -1,5 +1,10 @@ +load(qt_build_paths) + +isEmpty(PLUGIN_TYPE): error("PLUGIN_TYPE (plugins/ subdirectory) needs to be defined.") + TEMPLATE = lib -CONFIG += qt plugin +CONFIG += plugin +DESTDIR = $$MODULE_BASE_OUTDIR/plugins/$$PLUGIN_TYPE tool_plugin { !build_pass:contains(QT_CONFIG, build_all): CONFIG += release @@ -7,7 +12,6 @@ tool_plugin { contains(QT_CONFIG, debug_and_release):CONFIG += debug_and_release contains(QT_CONFIG, build_all):CONFIG += build_all } -TARGET = $$qtLibraryTarget($$TARGET) contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols contains(QT_CONFIG, separate_debug_info):CONFIG += separate_debug_info contains(QT_CONFIG, separate_debug_info_nocopy):CONFIG += separate_debug_info_nocopy @@ -16,6 +20,11 @@ contains(QT_CONFIG, c++11):CONFIG += c++11 contains(QT_CONFIG, static):CONFIG += static else:CONFIG += shared +target.path = $$[QT_INSTALL_PLUGINS]/$$PLUGIN_TYPE +INSTALLS += target + +TARGET = $$qtLibraryTarget($$TARGET) + load(qt_targets) wince*:LIBS += $$QMAKE_LIBS_GUI diff --git a/src/plugins/accessible/qaccessiblebase.pri b/src/plugins/accessible/qaccessiblebase.pri deleted file mode 100644 index 95c1fad13a..0000000000 --- a/src/plugins/accessible/qaccessiblebase.pri +++ /dev/null @@ -1,2 +0,0 @@ -target.path += $$[QT_INSTALL_PLUGINS]/accessible -INSTALLS += target diff --git a/src/plugins/accessible/widgets/widgets.pro b/src/plugins/accessible/widgets/widgets.pro index 3bf7dede56..afabbac9bc 100644 --- a/src/plugins/accessible/widgets/widgets.pro +++ b/src/plugins/accessible/widgets/widgets.pro @@ -1,9 +1,9 @@ TARGET = qtaccessiblewidgets + +PLUGIN_TYPE = accessible load(qt_plugin) -include (../qaccessiblebase.pri) QT += core-private gui-private widgets-private -DESTDIR = $$QT.gui.plugins/accessible QTDIR_build:REQUIRES += "contains(QT_CONFIG, accessibility)" diff --git a/src/plugins/bearer/blackberry/blackberry.pro b/src/plugins/bearer/blackberry/blackberry.pro index 5d4cf29554..220a506d90 100644 --- a/src/plugins/bearer/blackberry/blackberry.pro +++ b/src/plugins/bearer/blackberry/blackberry.pro @@ -1,4 +1,6 @@ TARGET = qbbbearer + +PLUGIN_TYPE = bearer load(qt_plugin) QT = core-private network-private @@ -15,7 +17,3 @@ SOURCES += qbbengine.cpp \ main.cpp OTHER_FILES += blackberry.json - -DESTDIR = $$QT.network.plugins/bearer -target.path += $$[QT_INSTALL_PLUGINS]/bearer -INSTALLS += target diff --git a/src/plugins/bearer/connman/connman.pro b/src/plugins/bearer/connman/connman.pro index 679637b37f..99d9b367f2 100644 --- a/src/plugins/bearer/connman/connman.pro +++ b/src/plugins/bearer/connman/connman.pro @@ -1,4 +1,6 @@ TARGET = qconnmanbearer + +PLUGIN_TYPE = bearer load(qt_plugin) QT = core network-private dbus @@ -17,7 +19,3 @@ SOURCES += main.cpp \ OTHER_FILES += connman.json -DESTDIR = $$QT.network.plugins/bearer -target.path += $$[QT_INSTALL_PLUGINS]/bearer -INSTALLS += target - diff --git a/src/plugins/bearer/corewlan/corewlan.pro b/src/plugins/bearer/corewlan/corewlan.pro index b60dac907c..481b75c8ab 100644 --- a/src/plugins/bearer/corewlan/corewlan.pro +++ b/src/plugins/bearer/corewlan/corewlan.pro @@ -1,4 +1,6 @@ TARGET = qcorewlanbearer + +PLUGIN_TYPE = bearer load(qt_plugin) QT = core-private network-private @@ -20,7 +22,3 @@ SOURCES += main.cpp \ OBJECTIVE_SOURCES += qcorewlanengine.mm OTHER_FILES += corewlan.json - -DESTDIR = $$QT.network.plugins/bearer -target.path += $$[QT_INSTALL_PLUGINS]/bearer -INSTALLS += target diff --git a/src/plugins/bearer/generic/generic.pro b/src/plugins/bearer/generic/generic.pro index e66c5b2c7a..a1da0dddda 100644 --- a/src/plugins/bearer/generic/generic.pro +++ b/src/plugins/bearer/generic/generic.pro @@ -1,4 +1,6 @@ TARGET = qgenericbearer + +PLUGIN_TYPE = bearer load(qt_plugin) QT = core-private network-private @@ -12,7 +14,3 @@ SOURCES += qgenericengine.cpp \ main.cpp OTHER_FILES += generic.json - -DESTDIR = $$QT.network.plugins/bearer -target.path += $$[QT_INSTALL_PLUGINS]/bearer -INSTALLS += target diff --git a/src/plugins/bearer/nativewifi/nativewifi.pro b/src/plugins/bearer/nativewifi/nativewifi.pro index 3124d58ff2..4382cd08cd 100644 --- a/src/plugins/bearer/nativewifi/nativewifi.pro +++ b/src/plugins/bearer/nativewifi/nativewifi.pro @@ -1,4 +1,6 @@ TARGET = qnativewifibearer + +PLUGIN_TYPE = bearer load(qt_plugin) QT = core-private network-private @@ -13,7 +15,3 @@ SOURCES += main.cpp \ ../qnetworksession_impl.cpp OTHER_FILES += nativewifi.json - -DESTDIR = $$QT.network.plugins/bearer -target.path += $$[QT_INSTALL_PLUGINS]/bearer -INSTALLS += target diff --git a/src/plugins/bearer/networkmanager/networkmanager.pro b/src/plugins/bearer/networkmanager/networkmanager.pro index c1c6664897..4f299e22f2 100644 --- a/src/plugins/bearer/networkmanager/networkmanager.pro +++ b/src/plugins/bearer/networkmanager/networkmanager.pro @@ -1,4 +1,6 @@ TARGET = qnmbearer + +PLUGIN_TYPE = bearer load(qt_plugin) QT = core network-private dbus @@ -16,7 +18,3 @@ SOURCES += main.cpp \ ../qnetworksession_impl.cpp OTHER_FILES += networkmanager.json - -DESTDIR = $$QT.network.plugins/bearer -target.path += $$[QT_INSTALL_PLUGINS]/bearer -INSTALLS += target diff --git a/src/plugins/bearer/nla/nla.pro b/src/plugins/bearer/nla/nla.pro index 29e98953b1..56c06a57b1 100644 --- a/src/plugins/bearer/nla/nla.pro +++ b/src/plugins/bearer/nla/nla.pro @@ -1,4 +1,6 @@ TARGET = qnlabearer + +PLUGIN_TYPE = bearer load(qt_plugin) QT = core core-private network network-private @@ -19,7 +21,3 @@ SOURCES += main.cpp \ ../qnetworksession_impl.cpp OTHER_FILES += nla.json - -DESTDIR = $$QT.network.plugins/bearer -target.path += $$[QT_INSTALL_PLUGINS]/bearer -INSTALLS += target diff --git a/src/plugins/generic/evdevkeyboard/evdevkeyboard.pro b/src/plugins/generic/evdevkeyboard/evdevkeyboard.pro index aa85fdcb06..97b827b779 100644 --- a/src/plugins/generic/evdevkeyboard/evdevkeyboard.pro +++ b/src/plugins/generic/evdevkeyboard/evdevkeyboard.pro @@ -1,9 +1,7 @@ TARGET = qevdevkeyboardplugin -load(qt_plugin) -DESTDIR = $$QT.gui.plugins/generic -target.path = $$[QT_INSTALL_PLUGINS]/generic -INSTALLS += target +PLUGIN_TYPE = generic +load(qt_plugin) QT += core-private platformsupport-private gui-private diff --git a/src/plugins/generic/evdevmouse/evdevmouse.pro b/src/plugins/generic/evdevmouse/evdevmouse.pro index fd7d0fee6a..c1356593df 100644 --- a/src/plugins/generic/evdevmouse/evdevmouse.pro +++ b/src/plugins/generic/evdevmouse/evdevmouse.pro @@ -1,9 +1,7 @@ TARGET = qevdevmouseplugin -load(qt_plugin) -DESTDIR = $$QT.gui.plugins/generic -target.path = $$[QT_INSTALL_PLUGINS]/generic -INSTALLS += target +PLUGIN_TYPE = generic +load(qt_plugin) QT += core-private platformsupport-private gui-private diff --git a/src/plugins/generic/evdevtablet/evdevtablet.pro b/src/plugins/generic/evdevtablet/evdevtablet.pro index 841d7b96f7..066819be33 100644 --- a/src/plugins/generic/evdevtablet/evdevtablet.pro +++ b/src/plugins/generic/evdevtablet/evdevtablet.pro @@ -1,9 +1,7 @@ TARGET = qevdevtabletplugin -load(qt_plugin) -DESTDIR = $$QT.gui.plugins/generic -target.path = $$[QT_INSTALL_PLUGINS]/generic -INSTALLS += target +PLUGIN_TYPE = generic +load(qt_plugin) SOURCES = main.cpp diff --git a/src/plugins/generic/evdevtouch/evdevtouch.pro b/src/plugins/generic/evdevtouch/evdevtouch.pro index a47d00fbf0..2c1d6913ad 100644 --- a/src/plugins/generic/evdevtouch/evdevtouch.pro +++ b/src/plugins/generic/evdevtouch/evdevtouch.pro @@ -1,9 +1,7 @@ TARGET = qevdevtouchplugin -load(qt_plugin) -DESTDIR = $$QT.gui.plugins/generic -target.path = $$[QT_INSTALL_PLUGINS]/generic -INSTALLS += target +PLUGIN_TYPE = generic +load(qt_plugin) SOURCES = main.cpp diff --git a/src/plugins/generic/meego/meego.pro b/src/plugins/generic/meego/meego.pro index 692ace485f..b8845418e8 100644 --- a/src/plugins/generic/meego/meego.pro +++ b/src/plugins/generic/meego/meego.pro @@ -1,10 +1,7 @@ TARGET = qmeegointegration -load(qt_plugin) - -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/generic -target.path = $$[QT_INSTALL_PLUGINS]/generic -INSTALLS += target +PLUGIN_TYPE = generic +load(qt_plugin) SOURCES = qmeegointegration.cpp \ main.cpp \ diff --git a/src/plugins/generic/tslib/tslib.pro b/src/plugins/generic/tslib/tslib.pro index 9046e18f77..ab0645d89a 100644 --- a/src/plugins/generic/tslib/tslib.pro +++ b/src/plugins/generic/tslib/tslib.pro @@ -1,9 +1,7 @@ TARGET = qtslibplugin -load(qt_plugin) -DESTDIR = $$QT.gui.plugins/generic -target.path = $$[QT_INSTALL_PLUGINS]/generic -INSTALLS += target +PLUGIN_TYPE = generic +load(qt_plugin) HEADERS = qtslib.h diff --git a/src/plugins/imageformats/gif/gif.pro b/src/plugins/imageformats/gif/gif.pro index b85ee984ac..d5acfedff7 100644 --- a/src/plugins/imageformats/gif/gif.pro +++ b/src/plugins/imageformats/gif/gif.pro @@ -1,11 +1,9 @@ TARGET = qgif + +PLUGIN_TYPE = imageformats load(qt_plugin) include(../../../gui/image/qgifhandler.pri) SOURCES += $$PWD/main.cpp HEADERS += $$PWD/main.h OTHER_FILES += gif.json - -DESTDIR = $$QT.gui.plugins/imageformats -target.path += $$[QT_INSTALL_PLUGINS]/imageformats -INSTALLS += target diff --git a/src/plugins/imageformats/ico/ico.pro b/src/plugins/imageformats/ico/ico.pro index 242e42b869..48bfd6b344 100644 --- a/src/plugins/imageformats/ico/ico.pro +++ b/src/plugins/imageformats/ico/ico.pro @@ -1,4 +1,6 @@ TARGET = qico + +PLUGIN_TYPE = imageformats load(qt_plugin) QTDIR_build:REQUIRES = "!contains(QT_CONFIG, no-ico)" @@ -7,7 +9,3 @@ HEADERS += qicohandler.h main.h SOURCES += main.cpp \ qicohandler.cpp OTHER_FILES += ico.json - -DESTDIR = $$QT.gui.plugins/imageformats -target.path += $$[QT_INSTALL_PLUGINS]/imageformats -INSTALLS += target diff --git a/src/plugins/imageformats/jpeg/jpeg.pro b/src/plugins/imageformats/jpeg/jpeg.pro index f2a41129d5..35153eb59c 100644 --- a/src/plugins/imageformats/jpeg/jpeg.pro +++ b/src/plugins/imageformats/jpeg/jpeg.pro @@ -1,4 +1,6 @@ TARGET = qjpeg + +PLUGIN_TYPE = imageformats load(qt_plugin) QT += core-private @@ -9,7 +11,3 @@ include(../../../gui/image/qjpeghandler.pri) SOURCES += main.cpp HEADERS += main.h OTHER_FILES += jpeg.json - -DESTDIR = $$QT.gui.plugins/imageformats -target.path += $$[QT_INSTALL_PLUGINS]/imageformats -INSTALLS += target diff --git a/src/plugins/platforminputcontexts/ibus/ibus.pro b/src/plugins/platforminputcontexts/ibus/ibus.pro index 8c8ab52c3c..033d5a4d5c 100644 --- a/src/plugins/platforminputcontexts/ibus/ibus.pro +++ b/src/plugins/platforminputcontexts/ibus/ibus.pro @@ -1,7 +1,7 @@ TARGET = ibusplatforminputcontextplugin -load(qt_plugin) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforminputcontexts +PLUGIN_TYPE = platforminputcontexts +load(qt_plugin) QT += dbus gui-private SOURCES += $$PWD/qibusplatforminputcontext.cpp \ @@ -16,6 +16,3 @@ HEADERS += $$PWD/qibusplatforminputcontext.h \ $$PWD/qibustypes.h OTHER_FILES += $$PWD/ibus.json - -target.path += $$[QT_INSTALL_PLUGINS]/platforminputcontexts -INSTALLS += target diff --git a/src/plugins/platforminputcontexts/maliit/maliit.pro b/src/plugins/platforminputcontexts/maliit/maliit.pro index 4174072c2b..dec6833196 100644 --- a/src/plugins/platforminputcontexts/maliit/maliit.pro +++ b/src/plugins/platforminputcontexts/maliit/maliit.pro @@ -1,7 +1,7 @@ TARGET = maliitplatforminputcontextplugin -load(qt_plugin) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforminputcontexts +PLUGIN_TYPE = platforminputcontexts +load(qt_plugin) QT += dbus gui-private SOURCES += $$PWD/qmaliitplatforminputcontext.cpp \ @@ -16,6 +16,3 @@ HEADERS += $$PWD/qmaliitplatforminputcontext.h \ $$PWD/contextadaptor.h OTHER_FILES += $$PWD/maliit.json - -target.path += $$[QT_INSTALL_PLUGINS]/platforminputcontexts -INSTALLS += target 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 diff --git a/src/plugins/printsupport/cocoa/cocoa.pro b/src/plugins/printsupport/cocoa/cocoa.pro index 477715a8e2..4e99b4a8f5 100644 --- a/src/plugins/printsupport/cocoa/cocoa.pro +++ b/src/plugins/printsupport/cocoa/cocoa.pro @@ -1,6 +1,7 @@ TARGET = cocoaprintersupport + +PLUGIN_TYPE = printsupport load(qt_plugin) -DESTDIR = $$QT.gui.plugins/printsupport QT += gui-private printsupport-private LIBS += -framework Cocoa @@ -8,6 +9,3 @@ LIBS += -framework Cocoa SOURCES += main.cpp OTHER_FILES += cocoa.json - -target.path += $$[QT_INSTALL_PLUGINS]/printsupport -INSTALLS += target diff --git a/src/plugins/printsupport/cups/cups.pro b/src/plugins/printsupport/cups/cups.pro index f23ad3fb5e..bd0b6af114 100644 --- a/src/plugins/printsupport/cups/cups.pro +++ b/src/plugins/printsupport/cups/cups.pro @@ -1,6 +1,7 @@ TARGET = cupsprintersupport + +PLUGIN_TYPE = printsupport load(qt_plugin) -DESTDIR = $$QT.gui.plugins/printsupport QT += core-private gui-private printsupport printsupport-private @@ -14,6 +15,3 @@ HEADERS += qcupsprintersupport_p.h \ qcupsprintengine_p.h OTHER_FILES += cups.json - -target.path += $$[QT_INSTALL_PLUGINS]/printsupport -INSTALLS += target diff --git a/src/plugins/printsupport/windows/windows.pro b/src/plugins/printsupport/windows/windows.pro index 3c5f22d411..a1ba15c727 100644 --- a/src/plugins/printsupport/windows/windows.pro +++ b/src/plugins/printsupport/windows/windows.pro @@ -1,11 +1,12 @@ TARGET = windows + +PLUGIN_TYPE = printsupport load(qt_plugin) QT *= core-private QT *= gui-private QT *= printsupport-private -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/printsupport INCLUDEPATH *= $$QT_SOURCE_TREE/src/printsupport/kernel SOURCES += \ @@ -17,6 +18,4 @@ HEADERS += \ OTHER_FILES += windows.json -target.path += $$[QT_INSTALL_PLUGINS]/printsupport -INSTALLS += target LIBS += -lwinspool -lcomdlg32 diff --git a/src/plugins/sqldrivers/qsqldriverbase.pri b/src/plugins/sqldrivers/qsqldriverbase.pri index 45638fcd4f..17424f6764 100644 --- a/src/plugins/sqldrivers/qsqldriverbase.pri +++ b/src/plugins/sqldrivers/qsqldriverbase.pri @@ -1,8 +1,6 @@ -load(qt_plugin) QT = core sql-private -DESTDIR = $$QT.sql.plugins/sqldrivers -target.path += $$[QT_INSTALL_PLUGINS]/sqldrivers -INSTALLS += target +PLUGIN_TYPE = sqldrivers +load(qt_plugin) DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII -- cgit v1.2.3