whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

beef up qt_plugin.prf 

it now defines the DESTDIR and creates an INSTALLS rule.

Change-Id: I15a462ccad9acbe3521c352fa98327825dc27c05
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
bb10
Oswald Buddenhagen 2012-10-24 14:00:12 +02:00 committed by The Qt Project
parent f5bc3fb2f0
commit 8c39b4c05f
36 changed files with 76 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mkspecs/features/qt_plugin.prf
View File

@ -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

2
src/plugins/accessible/qaccessiblebase.pri
View File

@ -1,2 +0,0 @@
target.path += $$[QT_INSTALL_PLUGINS]/accessible
INSTALLS += target

4
src/plugins/accessible/widgets/widgets.pro
View File

@ -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)"

6
src/plugins/bearer/blackberry/blackberry.pro
View File

@ -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

6
src/plugins/bearer/connman/connman.pro
View File

@ -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

6
src/plugins/bearer/corewlan/corewlan.pro
View File

@ -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

6
src/plugins/bearer/generic/generic.pro
View File

@ -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

6
src/plugins/bearer/nativewifi/nativewifi.pro
View File

@ -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

6
src/plugins/bearer/networkmanager/networkmanager.pro
View File

@ -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

6
src/plugins/bearer/nla/nla.pro
View File

@ -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

6
src/plugins/generic/evdevkeyboard/evdevkeyboard.pro
View File

@ -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

6
src/plugins/generic/evdevmouse/evdevmouse.pro
View File

@ -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

6
src/plugins/generic/evdevtablet/evdevtablet.pro
View File

@ -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

6
src/plugins/generic/evdevtouch/evdevtouch.pro
View File

@ -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

7
src/plugins/generic/meego/meego.pro
View File

@ -1,11 +1,8 @@
TARGET = qmeegointegration
PLUGIN_TYPE = generic
load(qt_plugin)
QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/generic
target.path = $$[QT_INSTALL_PLUGINS]/generic
INSTALLS += target
SOURCES = qmeegointegration.cpp \
main.cpp \
contextkitproperty.cpp

6
src/plugins/generic/tslib/tslib.pro
View File

@ -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

6
src/plugins/imageformats/gif/gif.pro
View File

@ -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

6
src/plugins/imageformats/ico/ico.pro
View File

@ -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

6
src/plugins/imageformats/jpeg/jpeg.pro
View File

@ -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

7
src/plugins/platforminputcontexts/ibus/ibus.pro
View File

@ -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

7
src/plugins/platforminputcontexts/maliit/maliit.pro
View File

@ -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

5
src/plugins/platforms/cocoa/cocoa.pro
View File

@ -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

5
src/plugins/platforms/directfb/directfb.pro
View File

@ -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

7
src/plugins/platforms/eglfs/eglfs.pro
View File

@ -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 += \

6
src/plugins/platforms/kms/kms.pro
View File

@ -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

7
src/plugins/platforms/linuxfb/linuxfb.pro
View File

@ -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

6
src/plugins/platforms/minimal/minimal.pro
View File

@ -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

7
src/plugins/platforms/minimalegl/minimalegl.pro
View File

@ -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

5
src/plugins/platforms/openwfd/openwf.pro
View File

@ -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

5
src/plugins/platforms/qnx/qnx.pro
View File

@ -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)

6
src/plugins/platforms/windows/windows.pro
View File

@ -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

5
src/plugins/platforms/xcb/xcb.pro
View File

@ -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

6
src/plugins/printsupport/cocoa/cocoa.pro
View File

@ -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

6
src/plugins/printsupport/cups/cups.pro
View File

@ -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

5
src/plugins/printsupport/windows/windows.pro
View File

@ -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

6
src/plugins/sqldrivers/qsqldriverbase.pri
View File

@ -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