Made qpluginbase.pri into a feature profile.

This enables other modules to use it without having access to the
QtBase sources.

Change-Id: I0a588b2e14ca88fa068c7c2bcc69ff669444f6c6
Task: QTBUG-19585
Reviewed-on: http://codereview.qt.nokia.com/237
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf
new file mode 100644 (file)
index 0000000..c4eaab8
--- /dev/null
+++ b/mkspecs/features/qt_plugin.prf
@@ -0,0 +1,41 @@
+TEMPLATE = lib
+isEmpty(QT_MAJOR_VERSION) {
+   VERSION=5.0.0
+} else {
+   VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
+}
+CONFIG += qt plugin
+
+win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release
+TARGET = $$qtLibraryTarget($$TARGET)
+contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
+
+load(qt_targets)
+
+wince*:LIBS += $$QMAKE_LIBS_GUI
+
+symbian: {
+    TARGET.EPOCALLOWDLLDATA=1
+    TARGET.CAPABILITY = All -Tcb
+    TARGET = $${TARGET}$${QT_LIBINFIX}
+    load(armcc_warnings)
+
+    # Make partial upgrade SIS file for Qt plugin dll's
+    # Partial upgrade SIS file
+    vendorinfo = \
+        "; Localised Vendor name" \
+        "%{\"Nokia\"}" \
+        " " \
+        "; Unique Vendor name" \
+        ":\"Nokia, Qt\"" \
+        " "
+    isEmpty(QT_LIBINFIX): PARTIAL_UPGRADE_UID = 0x2001E61C
+    else: PARTIAL_UPGRADE_UID = 0xE001E61C
+
+    pu_header = "; Partial upgrade package for testing $${TARGET} changes without reinstalling everything" \
+                "$${LITERAL_HASH}{\"$${TARGET}\"}, ($$PARTIAL_UPGRADE_UID), $${QT_MAJOR_VERSION},$${QT_MINOR_VERSION},$${QT_PATCH_VERSION}, TYPE=PU"
+    partial_upgrade.pkg_prerules = pu_header vendorinfo
+    partial_upgrade.files = $$QMAKE_LIBDIR_QT/$${TARGET}.dll
+    partial_upgrade.path = c:/sys/bin
+    DEPLOYMENT += partial_upgrade
+}

diff --git a/src/plugins/accessible/widgets/widgets.pro b/src/plugins/accessible/widgets/widgets.pro
index 8329bce..00d99f9 100644 (file)
--- a/src/plugins/accessible/widgets/widgets.pro
+++ b/src/plugins/accessible/widgets/widgets.pro
@@ -1,5 +1,5 @@
 TARGET  = qtaccessiblewidgets
-include(../../qpluginbase.pri)
+load(qt_plugin)
 include (../qaccessiblebase.pri)
 
 QT += core-private gui-private

diff --git a/src/plugins/bearer/connman/connman.pro b/src/plugins/bearer/connman/connman.pro
index f57a0c9..25243f8 100644 (file)
--- a/src/plugins/bearer/connman/connman.pro
+++ b/src/plugins/bearer/connman/connman.pro
@@ -1,5 +1,5 @@
 TARGET = qconnmanbearer
-include(../../qpluginbase.pri)
+load(qt_plugin)
 
 QT = core network-private dbus
 

diff --git a/src/plugins/bearer/corewlan/corewlan.pro b/src/plugins/bearer/corewlan/corewlan.pro
index adc1625..0d11b1e 100644 (file)
--- a/src/plugins/bearer/corewlan/corewlan.pro
+++ b/src/plugins/bearer/corewlan/corewlan.pro
@@ -1,5 +1,5 @@
 TARGET = qcorewlanbearer
-include(../../qpluginbase.pri)
+load(qt_plugin)
 
 QT = core-private network-private
 LIBS += -framework Foundation -framework SystemConfiguration

diff --git a/src/plugins/bearer/generic/generic.pro b/src/plugins/bearer/generic/generic.pro
index 94fefaf..4f86c2a 100644 (file)
--- a/src/plugins/bearer/generic/generic.pro
+++ b/src/plugins/bearer/generic/generic.pro
@@ -1,5 +1,5 @@
 TARGET = qgenericbearer
-include(../../qpluginbase.pri)
+load(qt_plugin)
 
 QT = core-private network-private
 

diff --git a/src/plugins/bearer/icd/icd.pro b/src/plugins/bearer/icd/icd.pro
index 4737045..3f57534 100644 (file)
--- a/src/plugins/bearer/icd/icd.pro
+++ b/src/plugins/bearer/icd/icd.pro
@@ -1,5 +1,5 @@
 TARGET = qicdbearer
-include(../../qpluginbase.pri)
+load(qt_plugin)
 
 QT = core network dbus
 

diff --git a/src/plugins/bearer/nativewifi/nativewifi.pro b/src/plugins/bearer/nativewifi/nativewifi.pro
index ba02f37..ec86cc0 100644 (file)
--- a/src/plugins/bearer/nativewifi/nativewifi.pro
+++ b/src/plugins/bearer/nativewifi/nativewifi.pro
@@ -1,5 +1,5 @@
 TARGET = qnativewifibearer
-include(../../qpluginbase.pri)
+load(qt_plugin)
 
 QT = core-private network-private
 

diff --git a/src/plugins/bearer/networkmanager/networkmanager.pro b/src/plugins/bearer/networkmanager/networkmanager.pro
index a9de156..262f60a 100644 (file)
--- a/src/plugins/bearer/networkmanager/networkmanager.pro
+++ b/src/plugins/bearer/networkmanager/networkmanager.pro
@@ -1,5 +1,5 @@
 TARGET = qnmbearer
-include(../../qpluginbase.pri)
+load(qt_plugin)
 
 QT = core network-private dbus
 

diff --git a/src/plugins/bearer/nla/nla.pro b/src/plugins/bearer/nla/nla.pro
index ecf958f..76da098 100644 (file)
--- a/src/plugins/bearer/nla/nla.pro
+++ b/src/plugins/bearer/nla/nla.pro
@@ -1,5 +1,5 @@
 TARGET = qnlabearer
-include(../../qpluginbase.pri)
+load(qt_plugin)
 
 QT = core network
 

diff --git a/src/plugins/bearer/symbian/symbian.pri b/src/plugins/bearer/symbian/symbian.pri
index 5d2ae1a..c4b3c6d 100644 (file)
--- a/src/plugins/bearer/symbian/symbian.pri
+++ b/src/plugins/bearer/symbian/symbian.pri
@@ -1,5 +1,5 @@
 TARGET = qsymbianbearer
-include(../../qpluginbase.pri)
+load(qt_plugin)
 
 QT = core network
 

diff --git a/src/plugins/codecs/cn/cn.pro b/src/plugins/codecs/cn/cn.pro
index 51a2f41..fc2e94b 100644 (file)
--- a/src/plugins/codecs/cn/cn.pro
+++ b/src/plugins/codecs/cn/cn.pro
@@ -1,5 +1,5 @@
 TARGET  = qcncodecs
-include(../../qpluginbase.pri)
+load(qt_plugin)
 
 CONFIG += warn_on
 DESTDIR = $$QT.core.plugins/codecs

diff --git a/src/plugins/codecs/jp/jp.pro b/src/plugins/codecs/jp/jp.pro
index e6b7a4b..834ca31 100644 (file)
--- a/src/plugins/codecs/jp/jp.pro
+++ b/src/plugins/codecs/jp/jp.pro
@@ -1,5 +1,5 @@
 TARGET  = qjpcodecs
-include(../../qpluginbase.pri)
+load(qt_plugin)
 
 CONFIG += warn_on
 DESTDIR = $$QT.core.plugins/codecs

diff --git a/src/plugins/codecs/kr/kr.pro b/src/plugins/codecs/kr/kr.pro
index 14c162c..f5aea65 100644 (file)
--- a/src/plugins/codecs/kr/kr.pro
+++ b/src/plugins/codecs/kr/kr.pro
@@ -1,5 +1,5 @@
 TARGET  = qkrcodecs
-include(../../qpluginbase.pri)
+load(qt_plugin)
 
 CONFIG += warn_on
 DESTDIR = $$QT.core.plugins/codecs

diff --git a/src/plugins/codecs/tw/tw.pro b/src/plugins/codecs/tw/tw.pro
index b0d5a2b..f76cba4 100644 (file)
--- a/src/plugins/codecs/tw/tw.pro
+++ b/src/plugins/codecs/tw/tw.pro
@@ -1,5 +1,5 @@
 TARGET   = qtwcodecs
-include(../../qpluginbase.pri)
+load(qt_plugin)
 
 CONFIG  += warn_on
 DESTDIR = $$QT.core.plugins/codecs

diff --git a/src/plugins/decorations/default/default.pro b/src/plugins/decorations/default/default.pro
index a30899a..c323d10 100644 (file)
--- a/src/plugins/decorations/default/default.pro
+++ b/src/plugins/decorations/default/default.pro
@@ -1,5 +1,5 @@
 TARGET  = qdecorationdefault
-include(../../qpluginbase.pri)
+load(qt_plugin)
 
 HEADERS        = $$QT_SOURCE_TREE/src/gui/embedded/qdecorationdefault_qws.h
 SOURCES        = main.cpp \

diff --git a/src/plugins/decorations/styled/styled.pro b/src/plugins/decorations/styled/styled.pro
index 151ef88..c5329ae 100644 (file)
--- a/src/plugins/decorations/styled/styled.pro
+++ b/src/plugins/decorations/styled/styled.pro
@@ -1,5 +1,5 @@
 TARGET = qdecorationstyled
-include(../../qpluginbase.pri)
+load(qt_plugin)
 
 DESTDIR = $$QT.gui.plugins/decorations
 target.path += $$[QT_INSTALL_PLUGINS]/decorations

diff --git a/src/plugins/decorations/windows/windows.pro b/src/plugins/decorations/windows/windows.pro
index 7f788a3..f27adb9 100644 (file)
--- a/src/plugins/decorations/windows/windows.pro
+++ b/src/plugins/decorations/windows/windows.pro
@@ -1,5 +1,5 @@
 TARGET  = qdecorationwindows
-include(../../qpluginbase.pri)
+load(qt_plugin)
 
 HEADERS        = $$QT_SOURCE_TREE/src/gui/embedded/qdecorationwindows_qws.h
 SOURCES        = main.cpp \

diff --git a/src/plugins/generic/linuxinput/linuxinput.pro b/src/plugins/generic/linuxinput/linuxinput.pro
index d4dc4bb..a771ee9 100644 (file)
--- a/src/plugins/generic/linuxinput/linuxinput.pro
+++ b/src/plugins/generic/linuxinput/linuxinput.pro
@@ -1,5 +1,5 @@
 TARGET = qlinuxinputplugin
-include(../../qpluginbase.pri)
+load(qt_plugin)
 
 DESTDIR = $$QT.gui.plugins/generic
 target.path = $$[QT_INSTALL_PLUGINS]/generic

diff --git a/src/plugins/generic/tslib/tslib.pro b/src/plugins/generic/tslib/tslib.pro
index 4851521..d9726b6 100644 (file)
--- a/src/plugins/generic/tslib/tslib.pro
+++ b/src/plugins/generic/tslib/tslib.pro
@@ -1,5 +1,5 @@
 TARGET = qlinuxinputplugin
-include(../../qpluginbase.pri)
+load(qt_plugin)
 
 DESTDIR = $$QT.gui.plugins/generic
 target.path = $$[QT_INSTALL_PLUGINS]/generic

diff --git a/src/plugins/gfxdrivers/ahi/ahi.pro b/src/plugins/gfxdrivers/ahi/ahi.pro
index 3abe2a7..fd07842 100644 (file)
--- a/src/plugins/gfxdrivers/ahi/ahi.pro
+++ b/src/plugins/gfxdrivers/ahi/ahi.pro
@@ -1,5 +1,5 @@
 TARGET = qahiscreen
-include(../../qpluginbase.pri)
+load(qt_plugin)
 
 DESTDIR = $$QT.gui.plugins/gfxdrivers
 

diff --git a/src/plugins/gfxdrivers/directfb/directfb.pro b/src/plugins/gfxdrivers/directfb/directfb.pro
index 54d11ca..6fb2a0f 100644 (file)
--- a/src/plugins/gfxdrivers/directfb/directfb.pro
+++ b/src/plugins/gfxdrivers/directfb/directfb.pro
@@ -1,5 +1,5 @@
 TARGET = qdirectfbscreen
-include(../../qpluginbase.pri)
+load(qt_plugin)
 include($$QT_SOURCE_TREE/src/gui/embedded/directfb.pri)
 
 DESTDIR = $$QT.gui.plugins/gfxdrivers

diff --git a/src/plugins/gfxdrivers/eglnullws/eglnullws.pro b/src/plugins/gfxdrivers/eglnullws/eglnullws.pro
index 30cebab..cb65c2b 100644 (file)
--- a/src/plugins/gfxdrivers/eglnullws/eglnullws.pro
+++ b/src/plugins/gfxdrivers/eglnullws/eglnullws.pro
@@ -1,5 +1,5 @@
 TARGET = qeglnullws
-include(../../qpluginbase.pri)
+load(qt_plugin)
 
 CONFIG += warn_on
 QT += opengl

diff --git a/src/plugins/gfxdrivers/linuxfb/linuxfb.pro b/src/plugins/gfxdrivers/linuxfb/linuxfb.pro
index c1cdc0e..2bbe910 100644 (file)
--- a/src/plugins/gfxdrivers/linuxfb/linuxfb.pro
+++ b/src/plugins/gfxdrivers/linuxfb/linuxfb.pro
@@ -1,5 +1,5 @@
 TARGET = qscreenlinuxfb
-include(../../qpluginbase.pri)
+load(qt_plugin)
 
 DESTDIR = $$QT.gui.plugins/gfxdrivers
 

diff --git a/src/plugins/gfxdrivers/qvfb/qvfb.pro b/src/plugins/gfxdrivers/qvfb/qvfb.pro
index e45319d..99376be 100644 (file)
--- a/src/plugins/gfxdrivers/qvfb/qvfb.pro
+++ b/src/plugins/gfxdrivers/qvfb/qvfb.pro
@@ -1,5 +1,5 @@
 TARGET = qscreenvfb
-include(../../qpluginbase.pri)
+load(qt_plugin)
 
 DEFINES        += QT_QWS_QVFB QT_QWS_MOUSE_QVFB QT_QWS_KBD_QVFB
 

diff --git a/src/plugins/gfxdrivers/transformed/transformed.pro b/src/plugins/gfxdrivers/transformed/transformed.pro
index f6e0770..f97713f 100644 (file)
--- a/src/plugins/gfxdrivers/transformed/transformed.pro
+++ b/src/plugins/gfxdrivers/transformed/transformed.pro
@@ -1,5 +1,5 @@
 TARGET  = qgfxtransformed
-include(../../qpluginbase.pri)
+load(qt_plugin)
 
 DEFINES        += QT_QWS_TRANSFORMED
 

diff --git a/src/plugins/gfxdrivers/vnc/vnc.pro b/src/plugins/gfxdrivers/vnc/vnc.pro
index 48bad8c..95e2ba7 100644 (file)
--- a/src/plugins/gfxdrivers/vnc/vnc.pro
+++ b/src/plugins/gfxdrivers/vnc/vnc.pro
@@ -1,5 +1,5 @@
 TARGET = qgfxvnc
-include(../../qpluginbase.pri)
+load(qt_plugin)
 
 DEFINES        += QT_QWS_VNC
 

diff --git a/src/plugins/graphicssystems/meego/meego.pro b/src/plugins/graphicssystems/meego/meego.pro
index c497ba2..5c650ee 100644 (file)
--- a/src/plugins/graphicssystems/meego/meego.pro
+++ b/src/plugins/graphicssystems/meego/meego.pro
@@ -1,5 +1,5 @@
 TARGET = qmeegographicssystem
-include(../../qpluginbase.pri)
+load(qt_plugin)
 
 QT += gui opengl
 

diff --git a/src/plugins/graphicssystems/opengl/opengl.pro b/src/plugins/graphicssystems/opengl/opengl.pro
index 30c8827..fd3542e 100644 (file)
--- a/src/plugins/graphicssystems/opengl/opengl.pro
+++ b/src/plugins/graphicssystems/opengl/opengl.pro
@@ -1,5 +1,5 @@
 TARGET = qglgraphicssystem
-include(../../qpluginbase.pri)
+load(qt_plugin)
 
 QT += core-private gui-private opengl-private
 

diff --git a/src/plugins/graphicssystems/openvg/openvg.pro b/src/plugins/graphicssystems/openvg/openvg.pro
index 6f8b139..6a73779 100644 (file)
--- a/src/plugins/graphicssystems/openvg/openvg.pro
+++ b/src/plugins/graphicssystems/openvg/openvg.pro
@@ -1,5 +1,5 @@
 TARGET = qvggraphicssystem
-include(../../qpluginbase.pri)
+load(qt_plugin)
 
 QT += openvg
 

diff --git a/src/plugins/graphicssystems/shivavg/shivavg.pro b/src/plugins/graphicssystems/shivavg/shivavg.pro
index 6bf9d7a..1d934cd 100644 (file)
--- a/src/plugins/graphicssystems/shivavg/shivavg.pro
+++ b/src/plugins/graphicssystems/shivavg/shivavg.pro
@@ -1,5 +1,5 @@
 TARGET = qshivavggraphicssystem
-include(../../qpluginbase.pri)
+load(qt_plugin)
 
 QT += openvg
 

diff --git a/src/plugins/graphicssystems/trace/trace.pro b/src/plugins/graphicssystems/trace/trace.pro
index b31beb3..f44bb32 100644 (file)
--- a/src/plugins/graphicssystems/trace/trace.pro
+++ b/src/plugins/graphicssystems/trace/trace.pro
@@ -1,5 +1,5 @@
 TARGET = qtracegraphicssystem
-include(../../qpluginbase.pri)
+load(qt_plugin)
 
 QT += core-private gui-private network
 

diff --git a/src/plugins/imageformats/gif/gif.pro b/src/plugins/imageformats/gif/gif.pro
index 4b72cae..b8d260e 100644 (file)
--- a/src/plugins/imageformats/gif/gif.pro
+++ b/src/plugins/imageformats/gif/gif.pro
@@ -1,5 +1,5 @@
 TARGET  = qgif
-include(../../qpluginbase.pri)
+load(qt_plugin)
 
 include(../../../gui/image/qgifhandler.pri)
 SOURCES += $$PWD/main.cpp

diff --git a/src/plugins/imageformats/ico/ico.pro b/src/plugins/imageformats/ico/ico.pro
index cef92ce..e0109c6 100644 (file)
--- a/src/plugins/imageformats/ico/ico.pro
+++ b/src/plugins/imageformats/ico/ico.pro
@@ -1,5 +1,5 @@
 TARGET  = qico
-include(../../qpluginbase.pri)
+load(qt_plugin)
 
 QTDIR_build:REQUIRES = "!contains(QT_CONFIG, no-ico)"
 

diff --git a/src/plugins/imageformats/jpeg/jpeg.pro b/src/plugins/imageformats/jpeg/jpeg.pro
index 1e6c24d..aa48972 100644 (file)
--- a/src/plugins/imageformats/jpeg/jpeg.pro
+++ b/src/plugins/imageformats/jpeg/jpeg.pro
@@ -1,5 +1,5 @@
 TARGET  = qjpeg
-include(../../qpluginbase.pri)
+load(qt_plugin)
 
 QT += core-private
 

diff --git a/src/plugins/imageformats/mng/mng.pro b/src/plugins/imageformats/mng/mng.pro
index 01dc418..72dc506 100644 (file)
--- a/src/plugins/imageformats/mng/mng.pro
+++ b/src/plugins/imageformats/mng/mng.pro
@@ -1,5 +1,5 @@
 TARGET  = qmng
-include(../../qpluginbase.pri)
+load(qt_plugin)
 
 QTDIR_build:REQUIRES = "!contains(QT_CONFIG, no-mng)"
 

diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro
index e4eb21b..012c49e 100644 (file)
--- a/src/plugins/imageformats/tiff/tiff.pro
+++ b/src/plugins/imageformats/tiff/tiff.pro
@@ -1,5 +1,5 @@
 TARGET  = qtiff
-include(../../qpluginbase.pri)
+load(qt_plugin)
 
 QTDIR_build:REQUIRES = "!contains(QT_CONFIG, no-tiff)"
 

diff --git a/src/plugins/inputmethods/imsw-multi/imsw-multi.pro b/src/plugins/inputmethods/imsw-multi/imsw-multi.pro
index 5d0535f..4c7b9b9 100644 (file)
--- a/src/plugins/inputmethods/imsw-multi/imsw-multi.pro
+++ b/src/plugins/inputmethods/imsw-multi/imsw-multi.pro
@@ -1,5 +1,5 @@
 TARGET   = qimsw-multi
-include(../../qpluginbase.pri)
+load(qt_plugin)
 CONFIG      += warn_on
 
 DESTDIR = $$QT.gui.plugins/inputmethods

diff --git a/src/plugins/kbddrivers/linuxinput/linuxinput.pro b/src/plugins/kbddrivers/linuxinput/linuxinput.pro
index c0af91c..8eaa786 100644 (file)
--- a/src/plugins/kbddrivers/linuxinput/linuxinput.pro
+++ b/src/plugins/kbddrivers/linuxinput/linuxinput.pro
@@ -1,5 +1,5 @@
 TARGET = qlinuxinputkbddriver
-include(../../qpluginbase.pri)
+load(qt_plugin)
 
 DESTDIR = $$QT.gui.plugins/kbddrivers
 target.path = $$[QT_INSTALL_PLUGINS]/kbddrivers

diff --git a/src/plugins/mousedrivers/linuxtp/linuxtp.pro b/src/plugins/mousedrivers/linuxtp/linuxtp.pro
index b8e26b4..e5d274a 100644 (file)
--- a/src/plugins/mousedrivers/linuxtp/linuxtp.pro
+++ b/src/plugins/mousedrivers/linuxtp/linuxtp.pro
@@ -1,5 +1,5 @@
 TARGET = qlinuxtpmousedriver
-include(../../qpluginbase.pri)
+load(qt_plugin)
 
 DESTDIR = $$QT.gui.plugins/mousedrivers
 target.path = $$[QT_INSTALL_PLUGINS]/mousedrivers

diff --git a/src/plugins/mousedrivers/pc/pc.pro b/src/plugins/mousedrivers/pc/pc.pro
index d38e3fe..04d7b0f 100644 (file)
--- a/src/plugins/mousedrivers/pc/pc.pro
+++ b/src/plugins/mousedrivers/pc/pc.pro
@@ -1,5 +1,5 @@
 TARGET = qpcmousedriver
-include(../../qpluginbase.pri)
+load(qt_plugin)
 
 DESTDIR = $$QT.gui.plugins/mousedrivers
 target.path = $$[QT_INSTALL_PLUGINS]/mousedrivers

diff --git a/src/plugins/mousedrivers/tslib/tslib.pro b/src/plugins/mousedrivers/tslib/tslib.pro
index e2fa013..552a2e7 100644 (file)
--- a/src/plugins/mousedrivers/tslib/tslib.pro
+++ b/src/plugins/mousedrivers/tslib/tslib.pro
@@ -1,5 +1,5 @@
 TARGET  = qtslibmousedriver
-include(../../qpluginbase.pri)
+load(qt_plugin)
 
 DESTDIR = $$QT.gui.plugins/mousedrivers
 

diff --git a/src/plugins/platforms/cocoa/cocoa.pro b/src/plugins/platforms/cocoa/cocoa.pro
index 705e604..bfa147f 100644 (file)
--- a/src/plugins/platforms/cocoa/cocoa.pro
+++ b/src/plugins/platforms/cocoa/cocoa.pro
@@ -1,5 +1,5 @@
 TARGET = qcocoa
-include(../../qpluginbase.pri)
+load(qt_plugin)
 DESTDIR = $$QT.gui.plugins/platforms
 
 OBJECTIVE_SOURCES = main.mm \

diff --git a/src/plugins/platforms/directfb/directfb.pro b/src/plugins/platforms/directfb/directfb.pro
index 4a63746..f830177 100644 (file)
--- a/src/plugins/platforms/directfb/directfb.pro
+++ b/src/plugins/platforms/directfb/directfb.pro
@@ -1,5 +1,5 @@
 TARGET = qdirectfb
-include(../../qpluginbase.pri)
+load(qt_plugin)
 DESTDIR = $$QT.gui.plugins/platforms
 
 isEmpty(DIRECTFB_LIBS) {

diff --git a/src/plugins/platforms/externalplugin.pri b/src/plugins/platforms/externalplugin.pri
index 54da4d9..9b00acb 100644 (file)
--- a/src/plugins/platforms/externalplugin.pri
+++ b/src/plugins/platforms/externalplugin.pri
@@ -26,4 +26,4 @@
 QT_SOURCE_TREE = $$fromfile($$(QTDIR)/.qmake.cache,QT_SOURCE_TREE)
 QT_BUILD_TREE = $$fromfile($$(QTDIR)/.qmake.cache,QT_BUILD_TREE)
 
-include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri)
+load(qt_plugin)

diff --git a/src/plugins/platforms/fb_base/fb_base.pro b/src/plugins/platforms/fb_base/fb_base.pro
index 4445516..4ebd53b 100644 (file)
--- a/src/plugins/platforms/fb_base/fb_base.pro
+++ b/src/plugins/platforms/fb_base/fb_base.pro
@@ -6,7 +6,7 @@
 
 #QT       -= core gui
 TARGET = fb_base
-#include(../../qpluginbase.pri)
+#load(qt_plugin)
 
 DESTDIR = $$QT.gui.plugins/graphicssystems
 

diff --git a/src/plugins/platforms/linuxfb/linuxfb.pro b/src/plugins/platforms/linuxfb/linuxfb.pro
index 4e4fe6f..ce6814e 100644 (file)
--- a/src/plugins/platforms/linuxfb/linuxfb.pro
+++ b/src/plugins/platforms/linuxfb/linuxfb.pro
@@ -1,5 +1,5 @@
 TARGET = qlinuxfbgraphicssystem
-include(../../qpluginbase.pri)
+load(qt_plugin)
 
 DESTDIR = $$QT.gui.plugins/platforms
 

diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro
index d1088e3..d51b6b2 100644 (file)
--- a/src/plugins/platforms/minimal/minimal.pro
+++ b/src/plugins/platforms/minimal/minimal.pro
@@ -1,5 +1,5 @@
 TARGET = qminimal
-include(../../qpluginbase.pri)
+load(qt_plugin)
 
 QT = core-private gui-private
 DESTDIR = $$QT.gui.plugins/platforms

diff --git a/src/plugins/platforms/openkode/openkode.pro b/src/plugins/platforms/openkode/openkode.pro
index a6e7d76..ad17a3b 100644 (file)
--- a/src/plugins/platforms/openkode/openkode.pro
+++ b/src/plugins/platforms/openkode/openkode.pro
@@ -1,5 +1,5 @@
 TARGET = qopenkodeintegration
-include(../../qpluginbase.pri)
+load(qt_plugin)
 
 QT += opengl
 

diff --git a/src/plugins/platforms/openvglite/openvglite.pro b/src/plugins/platforms/openvglite/openvglite.pro
index 11e867d..bb7efe9 100644 (file)
--- a/src/plugins/platforms/openvglite/openvglite.pro
+++ b/src/plugins/platforms/openvglite/openvglite.pro
@@ -1,5 +1,5 @@
 TARGET = qvglitegraphicssystem
-include(../../qpluginbase.pri)
+load(qt_plugin)
 
 QT += openvg
 

diff --git a/src/plugins/platforms/qvfb/qvfb.pro b/src/plugins/platforms/qvfb/qvfb.pro
index bc17525..5db8533 100644 (file)
--- a/src/plugins/platforms/qvfb/qvfb.pro
+++ b/src/plugins/platforms/qvfb/qvfb.pro
@@ -1,5 +1,5 @@
 TARGET = qvfbintegration
-include(../../qpluginbase.pri)
+load(qt_plugin)
 
 DESTDIR = $$QT.gui.plugins/platforms
 

diff --git a/src/plugins/platforms/uikit/uikit.pro b/src/plugins/platforms/uikit/uikit.pro
index 6f5947f..45a48dc 100644 (file)
--- a/src/plugins/platforms/uikit/uikit.pro
+++ b/src/plugins/platforms/uikit/uikit.pro
@@ -1,5 +1,5 @@
 TARGET = quikit
-include(../../qpluginbase.pri)
+load(qt_plugin)
 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms
 
 QT += opengl

diff --git a/src/plugins/platforms/vnc/vnc.pro b/src/plugins/platforms/vnc/vnc.pro
index a7b8ca5..85bffb0 100644 (file)
--- a/src/plugins/platforms/vnc/vnc.pro
+++ b/src/plugins/platforms/vnc/vnc.pro
@@ -1,5 +1,5 @@
 TARGET = qvncgraphicssystem
-include(../../qpluginbase.pri)
+load(qt_plugin)
 
 QT += network
 

diff --git a/src/plugins/platforms/wayland/wayland.pro b/src/plugins/platforms/wayland/wayland.pro
index 3f5a69c..857a291 100644 (file)
--- a/src/plugins/platforms/wayland/wayland.pro
+++ b/src/plugins/platforms/wayland/wayland.pro
@@ -1,5 +1,5 @@
 TARGET = qwayland
-include(../../qpluginbase.pri)
+load(qt_plugin)
 
 QT+=gui-private core-private opengl-private
 

diff --git a/src/plugins/platforms/xcb/xcb.pro b/src/plugins/platforms/xcb/xcb.pro
index 139f5c9..27d10b6 100644 (file)
--- a/src/plugins/platforms/xcb/xcb.pro
+++ b/src/plugins/platforms/xcb/xcb.pro
@@ -1,6 +1,6 @@
 TARGET = xcb
 
-include(../../qpluginbase.pri)
+load(qt_plugin)
 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms
 
 QT += core-private gui-private

diff --git a/src/plugins/platforms/xlib/xlib.pro b/src/plugins/platforms/xlib/xlib.pro
index 902d379..2cba551 100644 (file)
--- a/src/plugins/platforms/xlib/xlib.pro
+++ b/src/plugins/platforms/xlib/xlib.pro
@@ -1,6 +1,6 @@
 TARGET = qxlib
 
-include(../../qpluginbase.pri)
+load(qt_plugin)
 DESTDIR = $$QT.gui.plugins/platforms
 
 QT += core-private gui-private opengl-private

diff --git a/src/plugins/qpluginbase.pri b/src/plugins/qpluginbase.pri
index 2dd96bf..b22a527 100644 (file)
--- a/src/plugins/qpluginbase.pri
+++ b/src/plugins/qpluginbase.pri
@@ -1,41 +1 @@
-TEMPLATE = lib
-isEmpty(QT_MAJOR_VERSION) {
-   VERSION=5.0.0
-} else {
-   VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
-}
-CONFIG += qt plugin
-
-win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release
-TARGET = $$qtLibraryTarget($$TARGET)
-contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
-
-include(../qt_targets.pri)
-
-wince*:LIBS += $$QMAKE_LIBS_GUI
-
-symbian: {
-    TARGET.EPOCALLOWDLLDATA=1
-    TARGET.CAPABILITY = All -Tcb
-    TARGET = $${TARGET}$${QT_LIBINFIX}
-    load(armcc_warnings)
-
-    # Make partial upgrade SIS file for Qt plugin dll's
-    # Partial upgrade SIS file
-    vendorinfo = \
-        "; Localised Vendor name" \
-        "%{\"Nokia\"}" \
-        " " \
-        "; Unique Vendor name" \
-        ":\"Nokia, Qt\"" \
-        " "
-    isEmpty(QT_LIBINFIX): PARTIAL_UPGRADE_UID = 0x2001E61C
-    else: PARTIAL_UPGRADE_UID = 0xE001E61C
-
-    pu_header = "; Partial upgrade package for testing $${TARGET} changes without reinstalling everything" \
-                "$${LITERAL_HASH}{\"$${TARGET}\"}, ($$PARTIAL_UPGRADE_UID), $${QT_MAJOR_VERSION},$${QT_MINOR_VERSION},$${QT_PATCH_VERSION}, TYPE=PU"
-    partial_upgrade.pkg_prerules = pu_header vendorinfo
-    partial_upgrade.files = $$QMAKE_LIBDIR_QT/$${TARGET}.dll
-    partial_upgrade.path = c:/sys/bin
-    DEPLOYMENT += partial_upgrade
-}
+load(qt_plugin)

diff --git a/src/plugins/s60/s60pluginbase.pri b/src/plugins/s60/s60pluginbase.pri
index 0cde7d2..41d4b27 100644 (file)
--- a/src/plugins/s60/s60pluginbase.pri
+++ b/src/plugins/s60/s60pluginbase.pri
@@ -1,6 +1,6 @@
 # Note: These version based 'plugins' are not an actual Qt plugins,
 # they are just regular runtime loaded libraries
-include(../qpluginbase.pri)
+load(qt_plugin)
 
 CONFIG  -= plugin
 

diff --git a/src/plugins/sqldrivers/qsqldriverbase.pri b/src/plugins/sqldrivers/qsqldriverbase.pri
index 7399c65..45638fc 100644 (file)
--- a/src/plugins/sqldrivers/qsqldriverbase.pri
+++ b/src/plugins/sqldrivers/qsqldriverbase.pri
@@ -1,4 +1,4 @@
-include(../qpluginbase.pri)
+load(qt_plugin)
 QT  = core sql-private
 DESTDIR = $$QT.sql.plugins/sqldrivers