diff options
Diffstat (limited to 'src')
57 files changed, 57 insertions, 97 deletions
diff --git a/src/plugins/accessible/widgets/widgets.pro b/src/plugins/accessible/widgets/widgets.pro index 8329bce963..00d99f94e7 100644 --- 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 f57a0c930b..25243f8e0a 100644 --- 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 adc1625c3d..0d11b1e9d3 100644 --- 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 94fefaf6c2..4f86c2a38c 100644 --- 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 4737045ae7..3f5753409d 100644 --- 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 ba02f37d23..ec86cc0b93 100644 --- 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 a9de1561fd..262f60a69c 100644 --- 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 ecf958f559..76da098dbf 100644 --- 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 5d2ae1a5cd..c4b3c6d09d 100644 --- 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 51a2f41372..fc2e94b5a6 100644 --- 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 e6b7a4bb7f..834ca31ad6 100644 --- 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 14c162c6e8..f5aea6554f 100644 --- 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 b0d5a2b68a..f76cba4dbc 100644 --- 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 a30899a62b..c323d10930 100644 --- 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 151ef88178..c5329aea29 100644 --- 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 7f788a3d7e..f27adb908b 100644 --- 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 d4dc4bbbcb..a771ee9734 100644 --- 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 485152181c..d9726b6d3a 100644 --- 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 3abe2a76cc..fd078421f9 100644 --- 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 54d11ca159..6fb2a0f9aa 100644 --- 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 30cebab41a..cb65c2b627 100644 --- 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 c1cdc0eda7..2bbe910e63 100644 --- 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 e45319db87..99376be81c 100644 --- 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 f6e07704b3..f97713fc38 100644 --- 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 48bad8c6e3..95e2ba7cf8 100644 --- 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 c497ba2eb6..5c650eef2e 100644 --- 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 30c88271b6..fd3542ecf0 100644 --- 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 6f8b13907a..6a737790a2 100644 --- 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 6bf9d7a975..1d934cd685 100644 --- 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 b31beb35f8..f44bb3211e 100644 --- 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 4b72cae6e4..b8d260e43c 100644 --- 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 cef92cedc8..e0109c6a32 100644 --- 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 1e6c24d061..aa489729a1 100644 --- 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 01dc418c1b..72dc506cf9 100644 --- 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 e4eb21b1e7..012c49ecf1 100644 --- 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 5d0535f3ac..4c7b9b96d8 100644 --- 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 c0af91c7f0..8eaa786ce0 100644 --- 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 b8e26b4483..e5d274a0b7 100644 --- 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 d38e3fe5d1..04d7b0f06f 100644 --- 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 e2fa013fdb..552a2e7173 100644 --- 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 705e60439e..bfa147f948 100644 --- 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 4a637463ef..f830177dcb 100644 --- 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 54da4d957c..9b00acb4e9 100644 --- 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 4445516cc7..4ebd53b407 100644 --- 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 4e4fe6ff4b..ce6814ecc1 100644 --- 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 d1088e3233..d51b6b2ed0 100644 --- 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 a6e7d7665a..ad17a3bc78 100644 --- 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 11e867d998..bb7efe9bf3 100644 --- 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 bc17525104..5db8533264 100644 --- 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 6f5947f2c0..45a48dc92a 100644 --- 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 a7b8ca540a..85bffb0637 100644 --- 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 3f5a69cf75..857a2918ce 100644 --- 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 139f5c9591..27d10b6756 100644 --- 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 902d379ee2..2cba5513d5 100644 --- 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 2dd96bf7f2..b22a527761 100644 --- 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 0cde7d2277..41d4b27db2 100644 --- 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 7399c659da..45638fcd4f 100644 --- 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 |