From 34c8c32c16cabc56ba72ed4b5b56919f5676970e Mon Sep 17 00:00:00 2001 From: axis Date: Tue, 22 Mar 2011 13:20:53 +0100 Subject: [PATCH] Introduced the QT..plugins variable to module profiles. --- qt3support/modules/qt_qt3support.pri | 1 + qt3support/src/plugins/accessible/accessible.pro | 2 +- qtactiveqt/modules/qt_activeqt.pri | 1 + qtbase/bin/syncqt | 1 + qtbase/mkspecs/features/qt_config.prf | 1 + qtbase/src/modules/qt_core.pri | 1 + qtbase/src/modules/qt_dbus.pri | 1 + qtbase/src/modules/qt_gui.pri | 2 ++ qtbase/src/modules/qt_network.pri | 1 + qtbase/src/modules/qt_opengl.pri | 1 + qtbase/src/modules/qt_openvg.pri | 1 + qtbase/src/modules/qt_sql.pri | 1 + qtbase/src/modules/qt_testlib.pri | 1 + qtbase/src/modules/qt_uilib.pri | 1 + qtbase/src/modules/qt_uitools.pri | 1 + qtbase/src/modules/qt_xml.pri | 1 + qtbase/src/plugins/accessible/widgets/widgets.pro | 2 +- qtbase/src/plugins/bearer/connman/connman.pro | 2 +- qtbase/src/plugins/bearer/corewlan/corewlan.pro | 2 +- qtbase/src/plugins/bearer/generic/generic.pro | 2 +- qtbase/src/plugins/bearer/icd/icd.pro | 2 +- .../src/plugins/bearer/nativewifi/nativewifi.pro | 2 +- .../bearer/networkmanager/networkmanager.pro | 2 +- qtbase/src/plugins/bearer/nla/nla.pro | 2 +- qtbase/src/plugins/bearer/symbian/symbian.pri | 2 +- qtbase/src/plugins/codecs/cn/cn.pro | 2 +- qtbase/src/plugins/codecs/jp/jp.pro | 2 +- qtbase/src/plugins/codecs/kr/kr.pro | 2 +- qtbase/src/plugins/codecs/tw/tw.pro | 2 +- qtbase/src/plugins/decorations/default/default.pro | 2 +- qtbase/src/plugins/decorations/styled/styled.pro | 2 +- qtbase/src/plugins/decorations/windows/windows.pro | 2 +- .../src/plugins/generic/linuxinput/linuxinput.pro | 2 +- qtbase/src/plugins/generic/tslib/tslib.pro | 2 +- qtbase/src/plugins/gfxdrivers/ahi/ahi.pro | 2 +- .../src/plugins/gfxdrivers/directfb/directfb.pro | 2 +- .../src/plugins/gfxdrivers/eglnullws/eglnullws.pro | 2 +- qtbase/src/plugins/gfxdrivers/linuxfb/linuxfb.pro | 2 +- .../powervr/pvreglscreen/pvreglscreen.pro | 2 +- qtbase/src/plugins/gfxdrivers/qvfb/qvfb.pro | 2 +- .../plugins/gfxdrivers/transformed/transformed.pro | 2 +- qtbase/src/plugins/gfxdrivers/vnc/vnc.pro | 2 +- qtbase/src/plugins/graphicssystems/meego/meego.pro | 2 +- .../src/plugins/graphicssystems/opengl/opengl.pro | 2 +- .../src/plugins/graphicssystems/openvg/openvg.pro | 2 +- .../plugins/graphicssystems/shivavg/shivavg.pro | 2 +- qtbase/src/plugins/graphicssystems/trace/trace.pro | 2 +- qtbase/src/plugins/imageformats/gif/gif.pro | 2 +- qtbase/src/plugins/imageformats/ico/ico.pro | 2 +- qtbase/src/plugins/imageformats/jpeg/jpeg.pro | 2 +- qtbase/src/plugins/imageformats/mng/mng.pro | 2 +- qtbase/src/plugins/imageformats/tiff/tiff.pro | 2 +- .../plugins/inputmethods/imsw-multi/imsw-multi.pro | 2 +- .../plugins/kbddrivers/linuxinput/linuxinput.pro | 2 +- .../src/plugins/mousedrivers/linuxtp/linuxtp.pro | 2 +- qtbase/src/plugins/mousedrivers/pc/pc.pro | 2 +- qtbase/src/plugins/mousedrivers/tslib/tslib.pro | 2 +- qtbase/src/plugins/platforms/cocoa/cocoa.pro | 2 +- qtbase/src/plugins/platforms/directfb/directfb.pro | 2 +- qtbase/src/plugins/platforms/eglfs/eglfs.pro | 2 +- qtbase/src/plugins/platforms/fb_base/fb_base.pro | 2 +- qtbase/src/plugins/platforms/linuxfb/linuxfb.pro | 2 +- qtbase/src/plugins/platforms/minimal/minimal.pro | 2 +- qtbase/src/plugins/platforms/openkode/openkode.pro | 2 +- .../plugins/platforms/openvglite/openvglite.pro | 2 +- qtbase/src/plugins/platforms/qvfb/qvfb.pro | 2 +- qtbase/src/plugins/platforms/vnc/vnc.pro | 2 +- qtbase/src/plugins/platforms/wayland/wayland.pro | 2 +- qtbase/src/plugins/platforms/xlib/xlib.pro | 2 +- qtbase/src/plugins/s60/s60pluginbase.pri | 2 +- qtbase/src/plugins/sqldrivers/qsqldriverbase.pri | 2 +- qtdeclarative/modules/qt_declarative.pri | 1 + .../src/plugins/qmltooling/tcpserver/tcpserver.pro | 2 +- qtmultimedia/modules/qt_multimedia.pri | 1 + qtphonon/modules/qt_phonon.pri | 1 + qtphonon/src/plugins/phonon/mmf/mmf.pro | 2 +- qtscript/modules/qt_script.pri | 1 + qtscript/modules/qt_scripttools.pri | 1 + qtsvg/modules/qt_svg.pri | 1 + qttools/demos/arthurplugin/arthurplugin.pro | 2 +- .../containerextension/containerextension.pro | 2 +- .../customwidgetplugin/customwidgetplugin.pro | 2 +- .../taskmenuextension/taskmenuextension.pro | 2 +- .../worldtimeclockplugin/worldtimeclockplugin.pro | 2 +- qttools/modules/qt_clucene.pri | 1 + qttools/modules/qt_designer.pri | 1 + qttools/modules/qt_help.pri | 1 + .../src/designer/src/plugins/activeqt/activeqt.pro | 2 +- qttools/src/designer/src/plugins/plugins.pri | 2 +- qtxmlpatterns/modules/qt_xmlpatterns.pri | 1 + 90 files changed, 91 insertions(+), 65 deletions(-) diff --git a/qt3support/modules/qt_qt3support.pri b/qt3support/modules/qt_qt3support.pri index 082ad1a..12fc41e 100644 --- a/qt3support/modules/qt_qt3support.pri +++ b/qt3support/modules/qt_qt3support.pri @@ -9,6 +9,7 @@ QT.qt3support.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/Qt3Su QT.qt3support.private_includes = $$QT_MODULE_INCLUDE_BASE/Qt3Support/private QT.qt3support.sources = $$QT_MODULE_BASE/src/qt3support QT.qt3support.libs = $$QT_MODULE_LIB_BASE +QT.qt.plugins = $$QT_MODULE_PLUGIN_BASE QT.qt3support.imports = $$QT_MODULE_IMPORT_BASE QT.qt3support.depends = core gui QT.qt3support.DEFINES = QT3_SUPPORT QT_QT3SUPPORT_LIB diff --git a/qt3support/src/plugins/accessible/accessible.pro b/qt3support/src/plugins/accessible/accessible.pro index b69595b..3c458ce 100644 --- a/qt3support/src/plugins/accessible/accessible.pro +++ b/qt3support/src/plugins/accessible/accessible.pro @@ -5,7 +5,7 @@ CONFIG += qt_no_compat_warning include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri) include($$QT_SOURCE_TREE/src/plugins/accessible/qaccessiblebase.pri) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/accessible +DESTDIR = $$QT.qt3support.plugins/accessible QTDIR_build:REQUIRES += "contains(QT_CONFIG, accessibility)" diff --git a/qtactiveqt/modules/qt_activeqt.pri b/qtactiveqt/modules/qt_activeqt.pri index c10d06d..e2f8132 100644 --- a/qtactiveqt/modules/qt_activeqt.pri +++ b/qtactiveqt/modules/qt_activeqt.pri @@ -9,6 +9,7 @@ QT.activeqt.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/ActiveQ QT.activeqt.private_includes = $$QT_MODULE_INCLUDE_BASE/ActiveQt/private QT.activeqt.sources = $$QT_MODULE_BASE/src/activeqt QT.activeqt.libs = $$QT_MODULE_LIB_BASE +QT.activeqt.plugins = $$QT_MODULE_PLUGIN_BASE QT.activeqt.imports = $$QT_MODULE_IMPORT_BASE QT.activeqt.depends = gui QT.activeqt.DEFINES = QT_ACTIVEQT_LIB diff --git a/qtbase/bin/syncqt b/qtbase/bin/syncqt index 8f0047f..05d8ecb 100755 --- a/qtbase/bin/syncqt +++ b/qtbase/bin/syncqt @@ -1011,6 +1011,7 @@ foreach my $lib (@modules_to_sync) { print MODULE_PRI_FILE "QT_MODULE_INCLUDE_BASE = $out_basedir/include\n"; print MODULE_PRI_FILE "QT_MODULE_IMPORT_BASE = $qtbasedir/imports\n"; print MODULE_PRI_FILE "QT_MODULE_LIB_BASE = $qtbasedir/lib\n"; + print MODULE_PRI_FILE "QT_MODULE_PLUGIN_BASE = $qtbasedir/plugins\n"; print MODULE_PRI_FILE "include($modulepri)\n"; close MODULE_PRI_FILE; utime(time, (stat($modulepri))[9], $moduleprifwd); diff --git a/qtbase/mkspecs/features/qt_config.prf b/qtbase/mkspecs/features/qt_config.prf index 0be4dee..5afd82c 100644 --- a/qtbase/mkspecs/features/qt_config.prf +++ b/qtbase/mkspecs/features/qt_config.prf @@ -20,6 +20,7 @@ isEmpty(QMAKE_QT_CONFIG)|!exists($$QMAKE_QT_CONFIG) { # qt_.pri forwarding file QT_MODULE_INCLUDE_BASE = $$[QT_INSTALL_HEADERS] QT_MODULE_LIB_BASE = $$[QT_INSTALL_LIBS] + QT_MODULE_PLUGIN_BASE = $$[QT_INSTALL_PLUGINS] QT_MODULE_BIN_BASE = $$[QT_INSTALL_BINS] QT_MODULE_IMPORT_BASE = $$[QT_INSTALL_IMPORTS] include($$mod) diff --git a/qtbase/src/modules/qt_core.pri b/qtbase/src/modules/qt_core.pri index dc2ca54..9636fb2 100644 --- a/qtbase/src/modules/qt_core.pri +++ b/qtbase/src/modules/qt_core.pri @@ -9,6 +9,7 @@ QT.core.includes = $$QT_MODULE_INCLUDE_BASE/QtCore QT.core.private_includes = $$QT_MODULE_INCLUDE_BASE/QtCore/private QT.core.sources = $$QT_MODULE_BASE/src/corelib QT.core.libs = $$QT_MODULE_LIB_BASE +QT.core.plugins = $$QT_MODULE_PLUGIN_BASE QT.core.imports = $$QT_MODULE_IMPORT_BASE QT.core.depends = QT.core.DEFINES = QT_CORE_LIB diff --git a/qtbase/src/modules/qt_dbus.pri b/qtbase/src/modules/qt_dbus.pri index 7d3b7f3..13c9914 100644 --- a/qtbase/src/modules/qt_dbus.pri +++ b/qtbase/src/modules/qt_dbus.pri @@ -9,6 +9,7 @@ QT.dbus.includes = $$QT_MODULE_INCLUDE_BASE/QtDBus QT.dbus.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDBus/private QT.dbus.sources = $$QT_MODULE_BASE/src/dbus QT.dbus.libs = $$QT_MODULE_LIB_BASE +QT.dbus.plugins = $$QT_MODULE_PLUGIN_BASE QT.dbus.imports = $$QT_MODULE_IMPORT_BASE QT.dbus.depends = core xml QT.dbus.CONFIG = dbusadaptors dbusinterfaces diff --git a/qtbase/src/modules/qt_gui.pri b/qtbase/src/modules/qt_gui.pri index 74d2931..444f5c4 100644 --- a/qtbase/src/modules/qt_gui.pri +++ b/qtbase/src/modules/qt_gui.pri @@ -8,5 +8,7 @@ QT.gui.includes = $$QT_MODULE_INCLUDE_BASE/QtGui QT.gui.private_includes = $$QT_MODULE_INCLUDE_BASE/QtGui/private QT.gui.sources = $$QT_MODULE_BASE/src/gui QT.gui.libs = $$QT_MODULE_LIB_BASE +QT.gui.plugins = $$QT_MODULE_PLUGIN_BASE +QT.gui.imports = $$QT_MODULE_IMPORT_BASE QT.gui.depends = core network QT.gui.DEFINES = QT_GUI_LIB diff --git a/qtbase/src/modules/qt_network.pri b/qtbase/src/modules/qt_network.pri index f9474bb..f54afd2 100644 --- a/qtbase/src/modules/qt_network.pri +++ b/qtbase/src/modules/qt_network.pri @@ -9,6 +9,7 @@ QT.network.includes = $$QT_MODULE_INCLUDE_BASE/QtNetwork QT.network.private_includes = $$QT_MODULE_INCLUDE_BASE/QtNetwork/private QT.network.sources = $$QT_MODULE_BASE/src/network QT.network.libs = $$QT_MODULE_LIB_BASE +QT.network.plugins = $$QT_MODULE_PLUGIN_BASE QT.network.imports = $$QT_MODULE_IMPORT_BASE QT.network.depends = core QT.network.DEFINES = QT_NETWORK_LIB diff --git a/qtbase/src/modules/qt_opengl.pri b/qtbase/src/modules/qt_opengl.pri index a54c384..4d9a702 100644 --- a/qtbase/src/modules/qt_opengl.pri +++ b/qtbase/src/modules/qt_opengl.pri @@ -9,6 +9,7 @@ QT.opengl.includes = $$QT_MODULE_INCLUDE_BASE/QtOpenGL QT.opengl.private_includes = $$QT_MODULE_INCLUDE_BASE/QtOpenGL/private QT.opengl.sources = $$QT_MODULE_BASE/src/opengl QT.opengl.libs = $$QT_MODULE_LIB_BASE +QT.opengl.plugins = $$QT_MODULE_PLUGIN_BASE QT.opengl.imports = $$QT_MODULE_IMPORT_BASE QT.opengl.depends = core gui QT.opengl.CONFIG = opengl diff --git a/qtbase/src/modules/qt_openvg.pri b/qtbase/src/modules/qt_openvg.pri index 19a9a81..1261fd9 100644 --- a/qtbase/src/modules/qt_openvg.pri +++ b/qtbase/src/modules/qt_openvg.pri @@ -9,6 +9,7 @@ QT.openvg.includes = $$QT_MODULE_INCLUDE_BASE/QtOpenVG QT.openvg.private_includes = $$QT_MODULE_INCLUDE_BASE/QtOpenVG/private QT.openvg.sources = $$QT_MODULE_BASE/src/openvg QT.openvg.libs = $$QT_MODULE_LIB_BASE +QT.openvg.plugins = $$QT_MODULE_PLUGIN_BASE QT.openvg.imports = $$QT_MODULE_IMPORT_BASE QT.openvg.depends = core gui QT.openvg.CONFIG = openvg diff --git a/qtbase/src/modules/qt_sql.pri b/qtbase/src/modules/qt_sql.pri index c3950b1..e7ca42a 100644 --- a/qtbase/src/modules/qt_sql.pri +++ b/qtbase/src/modules/qt_sql.pri @@ -9,6 +9,7 @@ QT.sql.includes = $$QT_MODULE_INCLUDE_BASE/QtSql QT.sql.private_includes = $$QT_MODULE_INCLUDE_BASE/QtSql/private QT.sql.sources = $$QT_MODULE_BASE/src/sql QT.sql.libs = $$QT_MODULE_LIB_BASE +QT.sql.plugins = $$QT_MODULE_PLUGIN_BASE QT.sql.imports = $$QT_MODULE_IMPORT_BASE QT.sql.depends = core QT.sql.DEFINES = QT_SQL_LIB diff --git a/qtbase/src/modules/qt_testlib.pri b/qtbase/src/modules/qt_testlib.pri index a4f5dd2..6ef7939 100644 --- a/qtbase/src/modules/qt_testlib.pri +++ b/qtbase/src/modules/qt_testlib.pri @@ -9,6 +9,7 @@ QT.testlib.includes = $$QT_MODULE_INCLUDE_BASE/QtTest QT.testlib.private_includes = $$QT_MODULE_INCLUDE_BASE/QtTest/private QT.testlib.sources = $$QT_MODULE_BASE/src/testlib QT.testlib.libs = $$QT_MODULE_LIB_BASE +QT.testlib.plugins = $$QT_MODULE_PLUGIN_BASE QT.testlib.imports = $$QT_MODULE_IMPORT_BASE QT.testlib.depends = core QT.testlib.CONFIG = console diff --git a/qtbase/src/modules/qt_uilib.pri b/qtbase/src/modules/qt_uilib.pri index d1bd19a..7e1dc7c 100644 --- a/qtbase/src/modules/qt_uilib.pri +++ b/qtbase/src/modules/qt_uilib.pri @@ -9,5 +9,6 @@ QT.uilib.includes = $$QT_MODULE_INCLUDE_BASE/QtDesigner QT.uilib.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDesigner/private QT.uilib.sources = $$QT_MODULE_BASE/tools/uilib QT.uilib.libs = $$QT_MODULE_LIB_BASE +QT.uilib.plugins = $$QT_MODULE_PLUGIN_BASE QT.uilib.imports = $$QT_MODULE_IMPORT_BASE QT.uilib.depends = xml diff --git a/qtbase/src/modules/qt_uitools.pri b/qtbase/src/modules/qt_uitools.pri index 5b71e27..d221007 100644 --- a/qtbase/src/modules/qt_uitools.pri +++ b/qtbase/src/modules/qt_uitools.pri @@ -9,6 +9,7 @@ QT.uitools.includes = $$QT_MODULE_INCLUDE_BASE/QtUiTools QT.uitools.private_includes = $$QT_MODULE_INCLUDE_BASE/QtUiTools/private QT.uitools.sources = $$QT_MODULE_BASE/src/uitools QT.uitools.libs = $$QT_MODULE_LIB_BASE +QT.uitools.plugins = $$QT_MODULE_PLUGIN_BASE QT.uitools.imports = $$QT_MODULE_IMPORT_BASE QT.uitools.depends = xml QT.uitools.DEFINES = QT_UITOOLS_LIB diff --git a/qtbase/src/modules/qt_xml.pri b/qtbase/src/modules/qt_xml.pri index 95d9467..0ede3d2 100644 --- a/qtbase/src/modules/qt_xml.pri +++ b/qtbase/src/modules/qt_xml.pri @@ -9,6 +9,7 @@ QT.xml.includes = $$QT_MODULE_INCLUDE_BASE/QtXml QT.xml.private_includes = $$QT_MODULE_INCLUDE_BASE/QtXml/private QT.xml.sources = $$QT_MODULE_BASE/src/xml QT.xml.libs = $$QT_MODULE_LIB_BASE +QT.xml.plugins = $$QT_MODULE_PLUGIN_BASE QT.xml.imports = $$QT_MODULE_IMPORT_BASE QT.xml.depends = core QT.xml.DEFINES = QT_XML_LIB diff --git a/qtbase/src/plugins/accessible/widgets/widgets.pro b/qtbase/src/plugins/accessible/widgets/widgets.pro index 79110cb..092f3ca 100644 --- a/qtbase/src/plugins/accessible/widgets/widgets.pro +++ b/qtbase/src/plugins/accessible/widgets/widgets.pro @@ -2,7 +2,7 @@ TARGET = qtaccessiblewidgets include(../../qpluginbase.pri) include (../qaccessiblebase.pri) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/accessible +DESTDIR = $$QT.gui.plugins/accessible QTDIR_build:REQUIRES += "contains(QT_CONFIG, accessibility)" diff --git a/qtbase/src/plugins/bearer/connman/connman.pro b/qtbase/src/plugins/bearer/connman/connman.pro index dec408c..3ac54c3 100644 --- a/qtbase/src/plugins/bearer/connman/connman.pro +++ b/qtbase/src/plugins/bearer/connman/connman.pro @@ -15,7 +15,7 @@ SOURCES += main.cpp \ qconnmanengine.cpp \ ../qnetworksession_impl.cpp -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/bearer +DESTDIR = $$QT.network.plugins/bearer target.path += $$[QT_INSTALL_PLUGINS]/bearer INSTALLS += target diff --git a/qtbase/src/plugins/bearer/corewlan/corewlan.pro b/qtbase/src/plugins/bearer/corewlan/corewlan.pro index 90078e9..ae5371a 100644 --- a/qtbase/src/plugins/bearer/corewlan/corewlan.pro +++ b/qtbase/src/plugins/bearer/corewlan/corewlan.pro @@ -20,6 +20,6 @@ SOURCES += main.cpp \ OBJECTIVE_SOURCES += qcorewlanengine.mm -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/bearer +DESTDIR = $$QT.network.plugins/bearer target.path += $$[QT_INSTALL_PLUGINS]/bearer INSTALLS += target diff --git a/qtbase/src/plugins/bearer/generic/generic.pro b/qtbase/src/plugins/bearer/generic/generic.pro index c967f8c..94ab36c 100644 --- a/qtbase/src/plugins/bearer/generic/generic.pro +++ b/qtbase/src/plugins/bearer/generic/generic.pro @@ -11,6 +11,6 @@ SOURCES += qgenericengine.cpp \ ../qnetworksession_impl.cpp \ main.cpp -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/bearer +DESTDIR = $$QT.network.plugins/bearer target.path += $$[QT_INSTALL_PLUGINS]/bearer INSTALLS += target diff --git a/qtbase/src/plugins/bearer/icd/icd.pro b/qtbase/src/plugins/bearer/icd/icd.pro index 6700cda..4737045 100644 --- a/qtbase/src/plugins/bearer/icd/icd.pro +++ b/qtbase/src/plugins/bearer/icd/icd.pro @@ -28,6 +28,6 @@ SOURCES += main.cpp \ include(../../../3rdparty/libgq.pri) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/bearer +DESTDIR = $$QT.network.plugins/bearer target.path += $$[QT_INSTALL_PLUGINS]/bearer INSTALLS += target diff --git a/qtbase/src/plugins/bearer/nativewifi/nativewifi.pro b/qtbase/src/plugins/bearer/nativewifi/nativewifi.pro index 36dd36d..6df346c 100644 --- a/qtbase/src/plugins/bearer/nativewifi/nativewifi.pro +++ b/qtbase/src/plugins/bearer/nativewifi/nativewifi.pro @@ -12,6 +12,6 @@ SOURCES += main.cpp \ qnativewifiengine.cpp \ ../qnetworksession_impl.cpp -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/bearer +DESTDIR = $$QT.network.plugins/bearer target.path += $$[QT_INSTALL_PLUGINS]/bearer INSTALLS += target diff --git a/qtbase/src/plugins/bearer/networkmanager/networkmanager.pro b/qtbase/src/plugins/bearer/networkmanager/networkmanager.pro index e396263..b3e0883 100644 --- a/qtbase/src/plugins/bearer/networkmanager/networkmanager.pro +++ b/qtbase/src/plugins/bearer/networkmanager/networkmanager.pro @@ -15,6 +15,6 @@ SOURCES += main.cpp \ qnetworkmanagerengine.cpp \ ../qnetworksession_impl.cpp -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/bearer +DESTDIR = $$QT.network.plugins/bearer target.path += $$[QT_INSTALL_PLUGINS]/bearer INSTALLS += target diff --git a/qtbase/src/plugins/bearer/nla/nla.pro b/qtbase/src/plugins/bearer/nla/nla.pro index 5dfb6d7..ecf958f 100644 --- a/qtbase/src/plugins/bearer/nla/nla.pro +++ b/qtbase/src/plugins/bearer/nla/nla.pro @@ -18,6 +18,6 @@ SOURCES += main.cpp \ qnlaengine.cpp \ ../qnetworksession_impl.cpp -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/bearer +DESTDIR = $$QT.network.plugins/bearer target.path += $$[QT_INSTALL_PLUGINS]/bearer INSTALLS += target diff --git a/qtbase/src/plugins/bearer/symbian/symbian.pri b/qtbase/src/plugins/bearer/symbian/symbian.pri index 8d92f57..5d2ae1a 100644 --- a/qtbase/src/plugins/bearer/symbian/symbian.pri +++ b/qtbase/src/plugins/bearer/symbian/symbian.pri @@ -27,6 +27,6 @@ is_using_gnupoc { LIBS += -lConnMon } -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/bearer +DESTDIR = $$QT.network.plugins/bearer target.path += $$[QT_INSTALL_PLUGINS]/bearer INSTALLS += target diff --git a/qtbase/src/plugins/codecs/cn/cn.pro b/qtbase/src/plugins/codecs/cn/cn.pro index b0a8a91..51a2f41 100644 --- a/qtbase/src/plugins/codecs/cn/cn.pro +++ b/qtbase/src/plugins/codecs/cn/cn.pro @@ -2,7 +2,7 @@ TARGET = qcncodecs include(../../qpluginbase.pri) CONFIG += warn_on -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/codecs +DESTDIR = $$QT.core.plugins/codecs QT = core HEADERS = qgb18030codec.h diff --git a/qtbase/src/plugins/codecs/jp/jp.pro b/qtbase/src/plugins/codecs/jp/jp.pro index 6480e43..e6b7a4b 100644 --- a/qtbase/src/plugins/codecs/jp/jp.pro +++ b/qtbase/src/plugins/codecs/jp/jp.pro @@ -2,7 +2,7 @@ TARGET = qjpcodecs include(../../qpluginbase.pri) CONFIG += warn_on -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/codecs +DESTDIR = $$QT.core.plugins/codecs QT = core HEADERS = qjpunicode.h \ diff --git a/qtbase/src/plugins/codecs/kr/kr.pro b/qtbase/src/plugins/codecs/kr/kr.pro index 1cc28d8..14c162c 100644 --- a/qtbase/src/plugins/codecs/kr/kr.pro +++ b/qtbase/src/plugins/codecs/kr/kr.pro @@ -2,7 +2,7 @@ TARGET = qkrcodecs include(../../qpluginbase.pri) CONFIG += warn_on -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/codecs +DESTDIR = $$QT.core.plugins/codecs QT = core HEADERS = qeuckrcodec.h \ diff --git a/qtbase/src/plugins/codecs/tw/tw.pro b/qtbase/src/plugins/codecs/tw/tw.pro index 2ebb94f..b0d5a2b 100644 --- a/qtbase/src/plugins/codecs/tw/tw.pro +++ b/qtbase/src/plugins/codecs/tw/tw.pro @@ -2,7 +2,7 @@ TARGET = qtwcodecs include(../../qpluginbase.pri) CONFIG += warn_on -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/codecs +DESTDIR = $$QT.core.plugins/codecs QT = core HEADERS = qbig5codec.h diff --git a/qtbase/src/plugins/decorations/default/default.pro b/qtbase/src/plugins/decorations/default/default.pro index fb41d7f..a30899a 100644 --- a/qtbase/src/plugins/decorations/default/default.pro +++ b/qtbase/src/plugins/decorations/default/default.pro @@ -5,6 +5,6 @@ HEADERS = $$QT_SOURCE_TREE/src/gui/embedded/qdecorationdefault_qws.h SOURCES = main.cpp \ $$QT_SOURCE_TREE/src/gui/embedded/qdecorationdefault_qws.cpp -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/decorations +DESTDIR = $$QT.gui.plugins/decorations target.path += $$[QT_INSTALL_PLUGINS]/decorations INSTALLS += target diff --git a/qtbase/src/plugins/decorations/styled/styled.pro b/qtbase/src/plugins/decorations/styled/styled.pro index 5879992..151ef88 100644 --- a/qtbase/src/plugins/decorations/styled/styled.pro +++ b/qtbase/src/plugins/decorations/styled/styled.pro @@ -1,7 +1,7 @@ TARGET = qdecorationstyled include(../../qpluginbase.pri) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/decorations +DESTDIR = $$QT.gui.plugins/decorations target.path += $$[QT_INSTALL_PLUGINS]/decorations INSTALLS += target diff --git a/qtbase/src/plugins/decorations/windows/windows.pro b/qtbase/src/plugins/decorations/windows/windows.pro index 3cac77d..7f788a3 100644 --- a/qtbase/src/plugins/decorations/windows/windows.pro +++ b/qtbase/src/plugins/decorations/windows/windows.pro @@ -5,6 +5,6 @@ HEADERS = $$QT_SOURCE_TREE/src/gui/embedded/qdecorationwindows_qws.h SOURCES = main.cpp \ $$QT_SOURCE_TREE/src/gui/embedded/qdecorationwindows_qws.cpp -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/decorations +DESTDIR = $$QT.gui.plugins/decorations target.path += $$[QT_INSTALL_PLUGINS]/decorations INSTALLS += target diff --git a/qtbase/src/plugins/generic/linuxinput/linuxinput.pro b/qtbase/src/plugins/generic/linuxinput/linuxinput.pro index ad9f6a9..d4dc4bb 100644 --- a/qtbase/src/plugins/generic/linuxinput/linuxinput.pro +++ b/qtbase/src/plugins/generic/linuxinput/linuxinput.pro @@ -1,7 +1,7 @@ TARGET = qlinuxinputplugin include(../../qpluginbase.pri) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/generic +DESTDIR = $$QT.gui.plugins/generic target.path = $$[QT_INSTALL_PLUGINS]/generic INSTALLS += target diff --git a/qtbase/src/plugins/generic/tslib/tslib.pro b/qtbase/src/plugins/generic/tslib/tslib.pro index 74c7fd2..4851521 100644 --- a/qtbase/src/plugins/generic/tslib/tslib.pro +++ b/qtbase/src/plugins/generic/tslib/tslib.pro @@ -1,7 +1,7 @@ TARGET = qlinuxinputplugin include(../../qpluginbase.pri) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/generic +DESTDIR = $$QT.gui.plugins/generic target.path = $$[QT_INSTALL_PLUGINS]/generic INSTALLS += target diff --git a/qtbase/src/plugins/gfxdrivers/ahi/ahi.pro b/qtbase/src/plugins/gfxdrivers/ahi/ahi.pro index 6fc8a5c..3abe2a7 100644 --- a/qtbase/src/plugins/gfxdrivers/ahi/ahi.pro +++ b/qtbase/src/plugins/gfxdrivers/ahi/ahi.pro @@ -1,7 +1,7 @@ TARGET = qahiscreen include(../../qpluginbase.pri) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/gfxdrivers +DESTDIR = $$QT.gui.plugins/gfxdrivers target.path = $$[QT_INSTALL_PLUGINS]/gfxdrivers INSTALLS += target diff --git a/qtbase/src/plugins/gfxdrivers/directfb/directfb.pro b/qtbase/src/plugins/gfxdrivers/directfb/directfb.pro index d397050..54d11ca 100644 --- a/qtbase/src/plugins/gfxdrivers/directfb/directfb.pro +++ b/qtbase/src/plugins/gfxdrivers/directfb/directfb.pro @@ -2,7 +2,7 @@ TARGET = qdirectfbscreen include(../../qpluginbase.pri) include($$QT_SOURCE_TREE/src/gui/embedded/directfb.pri) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/gfxdrivers +DESTDIR = $$QT.gui.plugins/gfxdrivers target.path = $$[QT_INSTALL_PLUGINS]/gfxdrivers INSTALLS += target diff --git a/qtbase/src/plugins/gfxdrivers/eglnullws/eglnullws.pro b/qtbase/src/plugins/gfxdrivers/eglnullws/eglnullws.pro index 242ab07..30cebab 100644 --- a/qtbase/src/plugins/gfxdrivers/eglnullws/eglnullws.pro +++ b/qtbase/src/plugins/gfxdrivers/eglnullws/eglnullws.pro @@ -4,7 +4,7 @@ include(../../qpluginbase.pri) CONFIG += warn_on QT += opengl -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/gfxdrivers +DESTDIR = $$QT.gui.plugins/gfxdrivers target.path = $$[QT_INSTALL_PLUGINS]/gfxdrivers INSTALLS += target diff --git a/qtbase/src/plugins/gfxdrivers/linuxfb/linuxfb.pro b/qtbase/src/plugins/gfxdrivers/linuxfb/linuxfb.pro index 2a376e4..c1cdc0e 100644 --- a/qtbase/src/plugins/gfxdrivers/linuxfb/linuxfb.pro +++ b/qtbase/src/plugins/gfxdrivers/linuxfb/linuxfb.pro @@ -1,7 +1,7 @@ TARGET = qscreenlinuxfb include(../../qpluginbase.pri) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/gfxdrivers +DESTDIR = $$QT.gui.plugins/gfxdrivers target.path = $$[QT_INSTALL_PLUGINS]/gfxdrivers INSTALLS += target diff --git a/qtbase/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.pro b/qtbase/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.pro index 675be85..2b5212a 100644 --- a/qtbase/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.pro +++ b/qtbase/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.pro @@ -19,7 +19,7 @@ SOURCES = \ pvreglscreen.cpp \ pvreglwindowsurface.cpp -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/gfxdrivers +DESTDIR = $$QT.gui.plugins/gfxdrivers target.path = $$[QT_INSTALL_PLUGINS]/gfxdrivers INSTALLS += target diff --git a/qtbase/src/plugins/gfxdrivers/qvfb/qvfb.pro b/qtbase/src/plugins/gfxdrivers/qvfb/qvfb.pro index a0996e7..e45319d 100644 --- a/qtbase/src/plugins/gfxdrivers/qvfb/qvfb.pro +++ b/qtbase/src/plugins/gfxdrivers/qvfb/qvfb.pro @@ -3,7 +3,7 @@ include(../../qpluginbase.pri) DEFINES += QT_QWS_QVFB QT_QWS_MOUSE_QVFB QT_QWS_KBD_QVFB -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/gfxdrivers +DESTDIR = $$QT.gui.plugins/gfxdrivers HEADERS = \ $$QT_SOURCE_TREE/src/gui/embedded/qscreenvfb_qws.h \ diff --git a/qtbase/src/plugins/gfxdrivers/transformed/transformed.pro b/qtbase/src/plugins/gfxdrivers/transformed/transformed.pro index 173f7e9..f6e0770 100644 --- a/qtbase/src/plugins/gfxdrivers/transformed/transformed.pro +++ b/qtbase/src/plugins/gfxdrivers/transformed/transformed.pro @@ -3,7 +3,7 @@ include(../../qpluginbase.pri) DEFINES += QT_QWS_TRANSFORMED -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/gfxdrivers +DESTDIR = $$QT.gui.plugins/gfxdrivers HEADERS = $$QT_SOURCE_TREE/src/gui/embedded/qscreentransformed_qws.h SOURCES = main.cpp \ diff --git a/qtbase/src/plugins/gfxdrivers/vnc/vnc.pro b/qtbase/src/plugins/gfxdrivers/vnc/vnc.pro index 31da2f4..48bad8c 100644 --- a/qtbase/src/plugins/gfxdrivers/vnc/vnc.pro +++ b/qtbase/src/plugins/gfxdrivers/vnc/vnc.pro @@ -3,7 +3,7 @@ include(../../qpluginbase.pri) DEFINES += QT_QWS_VNC -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/gfxdrivers +DESTDIR = $$QT.gui.plugins/gfxdrivers HEADERS = \ qscreenvnc_qws.h \ diff --git a/qtbase/src/plugins/graphicssystems/meego/meego.pro b/qtbase/src/plugins/graphicssystems/meego/meego.pro index 0d3cce6..c497ba2 100644 --- a/qtbase/src/plugins/graphicssystems/meego/meego.pro +++ b/qtbase/src/plugins/graphicssystems/meego/meego.pro @@ -3,7 +3,7 @@ include(../../qpluginbase.pri) QT += gui opengl -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/graphicssystems +DESTDIR = $$QT.gui.plugins/graphicssystems HEADERS = qmeegographicssystem.h qmeegopixmapdata.h qmeegoextensions.h qmeegorasterpixmapdata.h qmeegolivepixmapdata.h SOURCES = qmeegographicssystem.cpp qmeegographicssystem.h qmeegographicssystemplugin.h qmeegographicssystemplugin.cpp qmeegopixmapdata.h qmeegopixmapdata.cpp qmeegoextensions.h qmeegoextensions.cpp qmeegorasterpixmapdata.h qmeegorasterpixmapdata.cpp qmeegolivepixmapdata.cpp qmeegolivepixmapdata.h dithering.cpp diff --git a/qtbase/src/plugins/graphicssystems/opengl/opengl.pro b/qtbase/src/plugins/graphicssystems/opengl/opengl.pro index 47e15c5..fb3cb53 100644 --- a/qtbase/src/plugins/graphicssystems/opengl/opengl.pro +++ b/qtbase/src/plugins/graphicssystems/opengl/opengl.pro @@ -3,7 +3,7 @@ include(../../qpluginbase.pri) QT += opengl -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/graphicssystems +DESTDIR = $$QT.gui.plugins/graphicssystems SOURCES = main.cpp diff --git a/qtbase/src/plugins/graphicssystems/openvg/openvg.pro b/qtbase/src/plugins/graphicssystems/openvg/openvg.pro index 781cdc4..6f8b139 100644 --- a/qtbase/src/plugins/graphicssystems/openvg/openvg.pro +++ b/qtbase/src/plugins/graphicssystems/openvg/openvg.pro @@ -3,7 +3,7 @@ include(../../qpluginbase.pri) QT += openvg -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/graphicssystems +DESTDIR = $$QT.gui.plugins/graphicssystems SOURCES = main.cpp qgraphicssystem_vg.cpp HEADERS = qgraphicssystem_vg_p.h diff --git a/qtbase/src/plugins/graphicssystems/shivavg/shivavg.pro b/qtbase/src/plugins/graphicssystems/shivavg/shivavg.pro index b8ea12a..6bf9d7a 100644 --- a/qtbase/src/plugins/graphicssystems/shivavg/shivavg.pro +++ b/qtbase/src/plugins/graphicssystems/shivavg/shivavg.pro @@ -3,7 +3,7 @@ include(../../qpluginbase.pri) QT += openvg -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/graphicssystems +DESTDIR = $$QT.gui.plugins/graphicssystems SOURCES = main.cpp shivavggraphicssystem.cpp shivavgwindowsurface.cpp HEADERS = shivavggraphicssystem.h shivavgwindowsurface.h diff --git a/qtbase/src/plugins/graphicssystems/trace/trace.pro b/qtbase/src/plugins/graphicssystems/trace/trace.pro index 07472e2..0958a86 100644 --- a/qtbase/src/plugins/graphicssystems/trace/trace.pro +++ b/qtbase/src/plugins/graphicssystems/trace/trace.pro @@ -3,7 +3,7 @@ include(../../qpluginbase.pri) QT += network -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/graphicssystems +DESTDIR = $$QT.gui.plugins/graphicssystems symbian:TARGET.UID3 = 0x2002130E SOURCES = main.cpp qgraphicssystem_trace.cpp diff --git a/qtbase/src/plugins/imageformats/gif/gif.pro b/qtbase/src/plugins/imageformats/gif/gif.pro index 439b431..4b72cae 100644 --- a/qtbase/src/plugins/imageformats/gif/gif.pro +++ b/qtbase/src/plugins/imageformats/gif/gif.pro @@ -4,7 +4,7 @@ include(../../qpluginbase.pri) include(../../../gui/image/qgifhandler.pri) SOURCES += $$PWD/main.cpp -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/imageformats +DESTDIR = $$QT.gui.plugins/imageformats target.path += $$[QT_INSTALL_PLUGINS]/imageformats INSTALLS += target diff --git a/qtbase/src/plugins/imageformats/ico/ico.pro b/qtbase/src/plugins/imageformats/ico/ico.pro index eadff41..cef92ce 100644 --- a/qtbase/src/plugins/imageformats/ico/ico.pro +++ b/qtbase/src/plugins/imageformats/ico/ico.pro @@ -7,7 +7,7 @@ HEADERS += qicohandler.h SOURCES += main.cpp \ qicohandler.cpp -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/imageformats +DESTDIR = $$QT.gui.plugins/imageformats target.path += $$[QT_INSTALL_PLUGINS]/imageformats INSTALLS += target diff --git a/qtbase/src/plugins/imageformats/jpeg/jpeg.pro b/qtbase/src/plugins/imageformats/jpeg/jpeg.pro index fb254b8..3a0e875 100644 --- a/qtbase/src/plugins/imageformats/jpeg/jpeg.pro +++ b/qtbase/src/plugins/imageformats/jpeg/jpeg.pro @@ -6,6 +6,6 @@ QTDIR_build:REQUIRES = "!contains(QT_CONFIG, no-jpeg)" include(../../../gui/image/qjpeghandler.pri) SOURCES += main.cpp -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/imageformats +DESTDIR = $$QT.gui.plugins/imageformats target.path += $$[QT_INSTALL_PLUGINS]/imageformats INSTALLS += target diff --git a/qtbase/src/plugins/imageformats/mng/mng.pro b/qtbase/src/plugins/imageformats/mng/mng.pro index 88085f3..01dc418 100644 --- a/qtbase/src/plugins/imageformats/mng/mng.pro +++ b/qtbase/src/plugins/imageformats/mng/mng.pro @@ -12,6 +12,6 @@ symbian: { include(../../../gui/image/qmnghandler.pri) SOURCES += main.cpp -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/imageformats +DESTDIR = $$QT.gui.plugins/imageformats target.path += $$[QT_INSTALL_PLUGINS]/imageformats INSTALLS += target diff --git a/qtbase/src/plugins/imageformats/tiff/tiff.pro b/qtbase/src/plugins/imageformats/tiff/tiff.pro index e781526..e4eb21b 100644 --- a/qtbase/src/plugins/imageformats/tiff/tiff.pro +++ b/qtbase/src/plugins/imageformats/tiff/tiff.pro @@ -6,7 +6,7 @@ QTDIR_build:REQUIRES = "!contains(QT_CONFIG, no-tiff)" include(../../../gui/image/qtiffhandler.pri) SOURCES += main.cpp -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/imageformats +DESTDIR = $$QT.gui.plugins/imageformats target.path += $$[QT_INSTALL_PLUGINS]/imageformats INSTALLS += target diff --git a/qtbase/src/plugins/inputmethods/imsw-multi/imsw-multi.pro b/qtbase/src/plugins/inputmethods/imsw-multi/imsw-multi.pro index f8dcb2c..5d0535f 100644 --- a/qtbase/src/plugins/inputmethods/imsw-multi/imsw-multi.pro +++ b/qtbase/src/plugins/inputmethods/imsw-multi/imsw-multi.pro @@ -2,7 +2,7 @@ TARGET = qimsw-multi include(../../qpluginbase.pri) CONFIG += warn_on -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/inputmethods +DESTDIR = $$QT.gui.plugins/inputmethods HEADERS += qmultiinputcontext.h \ qmultiinputcontextplugin.h diff --git a/qtbase/src/plugins/kbddrivers/linuxinput/linuxinput.pro b/qtbase/src/plugins/kbddrivers/linuxinput/linuxinput.pro index 862a220..c0af91c 100644 --- a/qtbase/src/plugins/kbddrivers/linuxinput/linuxinput.pro +++ b/qtbase/src/plugins/kbddrivers/linuxinput/linuxinput.pro @@ -1,7 +1,7 @@ TARGET = qlinuxinputkbddriver include(../../qpluginbase.pri) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/kbddrivers +DESTDIR = $$QT.gui.plugins/kbddrivers target.path = $$[QT_INSTALL_PLUGINS]/kbddrivers INSTALLS += target diff --git a/qtbase/src/plugins/mousedrivers/linuxtp/linuxtp.pro b/qtbase/src/plugins/mousedrivers/linuxtp/linuxtp.pro index ac1c8ff..b8e26b4 100644 --- a/qtbase/src/plugins/mousedrivers/linuxtp/linuxtp.pro +++ b/qtbase/src/plugins/mousedrivers/linuxtp/linuxtp.pro @@ -1,7 +1,7 @@ TARGET = qlinuxtpmousedriver include(../../qpluginbase.pri) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/mousedrivers +DESTDIR = $$QT.gui.plugins/mousedrivers target.path = $$[QT_INSTALL_PLUGINS]/mousedrivers INSTALLS += target diff --git a/qtbase/src/plugins/mousedrivers/pc/pc.pro b/qtbase/src/plugins/mousedrivers/pc/pc.pro index b93b25b..d38e3fe 100644 --- a/qtbase/src/plugins/mousedrivers/pc/pc.pro +++ b/qtbase/src/plugins/mousedrivers/pc/pc.pro @@ -1,7 +1,7 @@ TARGET = qpcmousedriver include(../../qpluginbase.pri) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/mousedrivers +DESTDIR = $$QT.gui.plugins/mousedrivers target.path = $$[QT_INSTALL_PLUGINS]/mousedrivers INSTALLS += target diff --git a/qtbase/src/plugins/mousedrivers/tslib/tslib.pro b/qtbase/src/plugins/mousedrivers/tslib/tslib.pro index 7b0748d..e2fa013 100644 --- a/qtbase/src/plugins/mousedrivers/tslib/tslib.pro +++ b/qtbase/src/plugins/mousedrivers/tslib/tslib.pro @@ -1,7 +1,7 @@ TARGET = qtslibmousedriver include(../../qpluginbase.pri) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/mousedrivers +DESTDIR = $$QT.gui.plugins/mousedrivers HEADERS = \ $$QT_SOURCE_TREE/src/gui/embedded/qmousedriverplugin_qws.h \ diff --git a/qtbase/src/plugins/platforms/cocoa/cocoa.pro b/qtbase/src/plugins/platforms/cocoa/cocoa.pro index 1633ee4..705e604 100644 --- a/qtbase/src/plugins/platforms/cocoa/cocoa.pro +++ b/qtbase/src/plugins/platforms/cocoa/cocoa.pro @@ -1,6 +1,6 @@ TARGET = qcocoa include(../../qpluginbase.pri) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms +DESTDIR = $$QT.gui.plugins/platforms OBJECTIVE_SOURCES = main.mm \ qcocoaintegration.mm \ diff --git a/qtbase/src/plugins/platforms/directfb/directfb.pro b/qtbase/src/plugins/platforms/directfb/directfb.pro index 65c49e3..4a63746 100644 --- a/qtbase/src/plugins/platforms/directfb/directfb.pro +++ b/qtbase/src/plugins/platforms/directfb/directfb.pro @@ -1,6 +1,6 @@ TARGET = qdirectfb include(../../qpluginbase.pri) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms +DESTDIR = $$QT.gui.plugins/platforms isEmpty(DIRECTFB_LIBS) { DIRECTFB_LIBS = -ldirectfb -lfusion -ldirect -lpthread diff --git a/qtbase/src/plugins/platforms/eglfs/eglfs.pro b/qtbase/src/plugins/platforms/eglfs/eglfs.pro index 7ad8fd9..3692e38 100644 --- a/qtbase/src/plugins/platforms/eglfs/eglfs.pro +++ b/qtbase/src/plugins/platforms/eglfs/eglfs.pro @@ -4,7 +4,7 @@ CONFIG += plugin QT += opengl -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms +DESTDIR = $$QT.gui.plugins/platforms #DEFINES += QEGL_EXTRA_DEBUG diff --git a/qtbase/src/plugins/platforms/fb_base/fb_base.pro b/qtbase/src/plugins/platforms/fb_base/fb_base.pro index e08c0c5..4445516 100644 --- a/qtbase/src/plugins/platforms/fb_base/fb_base.pro +++ b/qtbase/src/plugins/platforms/fb_base/fb_base.pro @@ -8,7 +8,7 @@ TARGET = fb_base #include(../../qpluginbase.pri) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/graphicssystems +DESTDIR = $$QT.gui.plugins/graphicssystems TEMPLATE = lib diff --git a/qtbase/src/plugins/platforms/linuxfb/linuxfb.pro b/qtbase/src/plugins/platforms/linuxfb/linuxfb.pro index 216b899..4e4fe6f 100644 --- a/qtbase/src/plugins/platforms/linuxfb/linuxfb.pro +++ b/qtbase/src/plugins/platforms/linuxfb/linuxfb.pro @@ -1,7 +1,7 @@ TARGET = qlinuxfbgraphicssystem include(../../qpluginbase.pri) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms +DESTDIR = $$QT.gui.plugins/platforms SOURCES = main.cpp qlinuxfbintegration.cpp HEADERS = qlinuxfbintegration.h diff --git a/qtbase/src/plugins/platforms/minimal/minimal.pro b/qtbase/src/plugins/platforms/minimal/minimal.pro index 438a88e..c832938 100644 --- a/qtbase/src/plugins/platforms/minimal/minimal.pro +++ b/qtbase/src/plugins/platforms/minimal/minimal.pro @@ -1,7 +1,7 @@ TARGET = qminimal include(../../qpluginbase.pri) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms +DESTDIR = $$QT.gui.plugins/platforms SOURCES = main.cpp \ qminimalintegration.cpp \ diff --git a/qtbase/src/plugins/platforms/openkode/openkode.pro b/qtbase/src/plugins/platforms/openkode/openkode.pro index c8ae415..a6e7d76 100644 --- a/qtbase/src/plugins/platforms/openkode/openkode.pro +++ b/qtbase/src/plugins/platforms/openkode/openkode.pro @@ -3,7 +3,7 @@ include(../../qpluginbase.pri) QT += opengl -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms +DESTDIR = $$QT.gui.plugins/platforms SOURCES = main.cpp \ qopenkodeintegration.cpp \ diff --git a/qtbase/src/plugins/platforms/openvglite/openvglite.pro b/qtbase/src/plugins/platforms/openvglite/openvglite.pro index 9d7860a..11e867d 100644 --- a/qtbase/src/plugins/platforms/openvglite/openvglite.pro +++ b/qtbase/src/plugins/platforms/openvglite/openvglite.pro @@ -3,7 +3,7 @@ include(../../qpluginbase.pri) QT += openvg -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/graphicssystems +DESTDIR = $$QT.gui.plugins/graphicssystems SOURCES = main.cpp qgraphicssystem_vglite.cpp qwindowsurface_vglite.cpp HEADERS = qgraphicssystem_vglite.h qwindowsurface_vglite.h diff --git a/qtbase/src/plugins/platforms/qvfb/qvfb.pro b/qtbase/src/plugins/platforms/qvfb/qvfb.pro index d2b332a..bc17525 100644 --- a/qtbase/src/plugins/platforms/qvfb/qvfb.pro +++ b/qtbase/src/plugins/platforms/qvfb/qvfb.pro @@ -1,7 +1,7 @@ TARGET = qvfbintegration include(../../qpluginbase.pri) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms +DESTDIR = $$QT.gui.plugins/platforms SOURCES = main.cpp qvfbintegration.cpp qvfbwindowsurface.cpp diff --git a/qtbase/src/plugins/platforms/vnc/vnc.pro b/qtbase/src/plugins/platforms/vnc/vnc.pro index 07f8d88..a7b8ca5 100644 --- a/qtbase/src/plugins/platforms/vnc/vnc.pro +++ b/qtbase/src/plugins/platforms/vnc/vnc.pro @@ -3,7 +3,7 @@ include(../../qpluginbase.pri) QT += network -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms +DESTDIR = $$QT.gui.plugins/platforms SOURCES = main.cpp qvncintegration.cpp HEADERS = qvncintegration.h diff --git a/qtbase/src/plugins/platforms/wayland/wayland.pro b/qtbase/src/plugins/platforms/wayland/wayland.pro index face860..92350c0 100644 --- a/qtbase/src/plugins/platforms/wayland/wayland.pro +++ b/qtbase/src/plugins/platforms/wayland/wayland.pro @@ -1,7 +1,7 @@ TARGET = qwayland include(../../qpluginbase.pri) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms +DESTDIR = $$QT.gui.plugins/platforms DEFINES += Q_PLATFORM_WAYLAND DEFINES += $$QMAKE_DEFINES_WAYLAND diff --git a/qtbase/src/plugins/platforms/xlib/xlib.pro b/qtbase/src/plugins/platforms/xlib/xlib.pro index 159fdbe..22b27d8 100644 --- a/qtbase/src/plugins/platforms/xlib/xlib.pro +++ b/qtbase/src/plugins/platforms/xlib/xlib.pro @@ -1,7 +1,7 @@ TARGET = qxlib include(../../qpluginbase.pri) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms +DESTDIR = $$QT.gui.plugins/platforms SOURCES = \ main.cpp \ diff --git a/qtbase/src/plugins/s60/s60pluginbase.pri b/qtbase/src/plugins/s60/s60pluginbase.pri index 4e15102..0cde7d2 100644 --- a/qtbase/src/plugins/s60/s60pluginbase.pri +++ b/qtbase/src/plugins/s60/s60pluginbase.pri @@ -4,7 +4,7 @@ include(../qpluginbase.pri) CONFIG -= plugin -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/s60 +DESTDIR = $$QT.gui.plugins/s60 MMP_RULES += NOEXPORTLIBRARY diff --git a/qtbase/src/plugins/sqldrivers/qsqldriverbase.pri b/qtbase/src/plugins/sqldrivers/qsqldriverbase.pri index 2f6943a..64f55fd 100644 --- a/qtbase/src/plugins/sqldrivers/qsqldriverbase.pri +++ b/qtbase/src/plugins/sqldrivers/qsqldriverbase.pri @@ -1,6 +1,6 @@ include(../qpluginbase.pri) QT = core sql -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/sqldrivers +DESTDIR = $$QT.sql.plugins/sqldrivers target.path += $$[QT_INSTALL_PLUGINS]/sqldrivers INSTALLS += target diff --git a/qtdeclarative/modules/qt_declarative.pri b/qtdeclarative/modules/qt_declarative.pri index 01c525d..d4dfecd 100644 --- a/qtdeclarative/modules/qt_declarative.pri +++ b/qtdeclarative/modules/qt_declarative.pri @@ -9,6 +9,7 @@ QT.declarative.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtDe QT.declarative.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDeclarative/private QT.declarative.sources = $$QT_MODULE_BASE/src/declarative QT.declarative.libs = $$QT_MODULE_LIB_BASE +QT.declarative.plugins = $$QT_MODULE_PLUGIN_BASE QT.declarative.imports = $$QT_MODULE_IMPORT_BASE QT.declarative.depends = gui script network QT.declarative.DEFINES = QT_DECLARATIVE_LIB diff --git a/qtdeclarative/src/plugins/qmltooling/tcpserver/tcpserver.pro b/qtdeclarative/src/plugins/qmltooling/tcpserver/tcpserver.pro index f4f2666..0a89b9e 100644 --- a/qtdeclarative/src/plugins/qmltooling/tcpserver/tcpserver.pro +++ b/qtdeclarative/src/plugins/qmltooling/tcpserver/tcpserver.pro @@ -3,7 +3,7 @@ QT += declarative network include(../../qpluginbase.pri) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/qmltooling +DESTDIR = $$QT.declarative.plugins/qmltooling QTDIR_build:REQUIRES += "contains(QT_CONFIG, declarative)" SOURCES += \ diff --git a/qtmultimedia/modules/qt_multimedia.pri b/qtmultimedia/modules/qt_multimedia.pri index a81df0e..469e5c8 100644 --- a/qtmultimedia/modules/qt_multimedia.pri +++ b/qtmultimedia/modules/qt_multimedia.pri @@ -9,6 +9,7 @@ QT.multimedia.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtMul QT.multimedia.private_includes = $$QT_MODULE_INCLUDE_BASE/QtMultimedia/private QT.multimedia.sources = $$QT_MODULE_BASE/src/multimedia QT.multimedia.libs = $$QT_MODULE_LIB_BASE +QT.multimedia.plugins = $$QT_MODULE_PLUGIN_BASE QT.multimedia.imports = $$QT_MODULE_IMPORT_BASE QT.multimedia.depends = core gui QT.multimedia.DEFINES = QT_MULTIMEDIA_LIB diff --git a/qtphonon/modules/qt_phonon.pri b/qtphonon/modules/qt_phonon.pri index af1b222..73e7da1 100644 --- a/qtphonon/modules/qt_phonon.pri +++ b/qtphonon/modules/qt_phonon.pri @@ -4,6 +4,7 @@ QT.phonon.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/phonon QT.phonon.private_includes = $$QT_MODULE_INCLUDE_BASE/phonon/private QT.phonon.sources = $$QT_MODULE_BASE/src/3rdparty/phonon/phonon QT.phonon.libs = $$QT_MODULE_LIB_BASE +QT.phonon.plugins = $$QT_MODULE_PLUGIN_BASE QT.phonon.imports = $$QT_MODULE_IMPORT_BASE QT.phonon.depends = core gui network QT.phonon.DEFINES = QT_PHONON_LIB diff --git a/qtphonon/src/plugins/phonon/mmf/mmf.pro b/qtphonon/src/plugins/phonon/mmf/mmf.pro index 9bf50c7..e3f9f82 100644 --- a/qtphonon/src/plugins/phonon/mmf/mmf.pro +++ b/qtphonon/src/plugins/phonon/mmf/mmf.pro @@ -137,7 +137,7 @@ symbian { LIBS += -lcommdb # This is needed for having the .qtplugin file properly created on Symbian. - QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/phonon_backend + DESTDIR = $$QT.phonon.plugins/phonon_backend target.path = $$[QT_INSTALL_PLUGINS]/phonon_backend INSTALLS += target diff --git a/qtscript/modules/qt_script.pri b/qtscript/modules/qt_script.pri index ff4494f..18c6632 100644 --- a/qtscript/modules/qt_script.pri +++ b/qtscript/modules/qt_script.pri @@ -9,6 +9,7 @@ QT.script.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtScript QT.script.private_includes = $$QT_MODULE_INCLUDE_BASE/QtScript/private QT.script.sources = $$QT_MODULE_BASE/src/script QT.script.libs = $$QT_MODULE_LIB_BASE +QT.script.plugins = $$QT_MODULE_PLUGIN_BASE QT.script.imports = $$QT_MODULE_IMPORT_BASE QT.script.depends = core QT.script.DEFINES = QT_SCRIPT_LIB diff --git a/qtscript/modules/qt_scripttools.pri b/qtscript/modules/qt_scripttools.pri index 70acaf4..63ae470a 100644 --- a/qtscript/modules/qt_scripttools.pri +++ b/qtscript/modules/qt_scripttools.pri @@ -9,6 +9,7 @@ QT.scripttools.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtSc QT.scripttools.private_includes = $$QT_MODULE_INCLUDE_BASE/QtScriptTools/private QT.scripttools.sources = $$QT_MODULE_BASE/src/scripttools QT.scripttools.libs = $$QT_MODULE_LIB_BASE +QT.scripttools.plugins = $$QT_MODULE_PLUGIN_BASE QT.scripttools.imports = $$QT_MODULE_IMPORT_BASE QT.scripttools.depends = script gui network QT.scripttools.DEFINES = QT_SCRIPTTOOLS_LIB diff --git a/qtsvg/modules/qt_svg.pri b/qtsvg/modules/qt_svg.pri index fda42a4..bec1718 100644 --- a/qtsvg/modules/qt_svg.pri +++ b/qtsvg/modules/qt_svg.pri @@ -9,6 +9,7 @@ QT.svg.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtSvg QT.svg.private_includes = $$QT_MODULE_INCLUDE_BASE/QtSvg/private QT.svg.sources = $$QT_MODULE_BASE/src/svg QT.svg.libs = $$QT_MODULE_LIB_BASE +QT.svg.plugins = $$QT_MODULE_PLUGIN_BASE QT.svg.imports = $$QT_MODULE_IMPORT_BASE QT.svg.depends = core gui QT.svg.DEFINES = QT_SVG_LIB diff --git a/qttools/demos/arthurplugin/arthurplugin.pro b/qttools/demos/arthurplugin/arthurplugin.pro index 3255699..3460eb4 100644 --- a/qttools/demos/arthurplugin/arthurplugin.pro +++ b/qttools/demos/arthurplugin/arthurplugin.pro @@ -4,7 +4,7 @@ QTDIR = $$QT_SOURCE_TREE CONFIG += designer plugin TEMPLATE = lib TARGET = $$qtLibraryTarget(arthurplugin) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/designer +DESTDIR = $$QT.designer.plugins/designer contains(QT_CONFIG, opengl) { DEFINES += QT_OPENGL_SUPPORT diff --git a/qttools/examples/designer/containerextension/containerextension.pro b/qttools/examples/designer/containerextension/containerextension.pro index 32785ab..1c3cfd7 100644 --- a/qttools/examples/designer/containerextension/containerextension.pro +++ b/qttools/examples/designer/containerextension/containerextension.pro @@ -5,7 +5,7 @@ TARGET = $$qtLibraryTarget($$TARGET) #! [1] CONFIG += designer plugin #! [1] -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/designer +DESTDIR = $$QT.designer.plugins/designer #! [2] HEADERS += multipagewidget.h \ diff --git a/qttools/examples/designer/customwidgetplugin/customwidgetplugin.pro b/qttools/examples/designer/customwidgetplugin/customwidgetplugin.pro index ae85532..450a8a6 100644 --- a/qttools/examples/designer/customwidgetplugin/customwidgetplugin.pro +++ b/qttools/examples/designer/customwidgetplugin/customwidgetplugin.pro @@ -5,7 +5,7 @@ TARGET = $$qtLibraryTarget($$TARGET) #! [2] TEMPLATE = lib #! [1] #! [2] -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/designer +DESTDIR = $$QT.designer.plugins/designer #! [3] HEADERS = analogclock.h \ diff --git a/qttools/examples/designer/taskmenuextension/taskmenuextension.pro b/qttools/examples/designer/taskmenuextension/taskmenuextension.pro index aa57207..51a1716 100644 --- a/qttools/examples/designer/taskmenuextension/taskmenuextension.pro +++ b/qttools/examples/designer/taskmenuextension/taskmenuextension.pro @@ -5,7 +5,7 @@ TARGET = $$qtLibraryTarget($$TARGET) #! [1] CONFIG += designer plugin #! [1] -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/designer +DESTDIR = $$QT.designer.plugins/designer #! [2] HEADERS += tictactoe.h \ diff --git a/qttools/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro b/qttools/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro index fa77d86..bf9c869 100644 --- a/qttools/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro +++ b/qttools/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro @@ -5,7 +5,7 @@ TARGET = $$qtLibraryTarget($$TARGET) #! [1] TEMPLATE = lib #! [1] -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/designer +DESTDIR = $$QT.designer.plugins/designer #! [2] HEADERS = worldtimeclock.h \ diff --git a/qttools/modules/qt_clucene.pri b/qttools/modules/qt_clucene.pri index 7f7c56b..a7e9f54 100644 --- a/qttools/modules/qt_clucene.pri +++ b/qttools/modules/qt_clucene.pri @@ -9,5 +9,6 @@ QT.clucene.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtCLucen QT.clucene.private_includes = $$QT_MODULE_INCLUDE_BASE/QtCLucene/private QT.clucene.sources = $$QT_MODULE_BASE/src/assistant/lib/fulltextsearch QT.clucene.libs = $$QT_MODULE_LIB_BASE +QT.clucene.plugins = $$QT_MODULE_PLUGIN_BASE QT.clucene.imports = $$QT_MODULE_IMPORT_BASE QT.clucene.depends = core diff --git a/qttools/modules/qt_designer.pri b/qttools/modules/qt_designer.pri index 913866f..c44e69f 100644 --- a/qttools/modules/qt_designer.pri +++ b/qttools/modules/qt_designer.pri @@ -9,6 +9,7 @@ QT.designer.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtDesig QT.designer.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDesigner/private QT.designer.sources = $$QT_MODULE_BASE/src/designer/src/lib QT.designer.libs = $$QT_MODULE_LIB_BASE +QT.designer.plugins = $$QT_MODULE_PLUGIN_BASE QT.designer.imports = $$QT_MODULE_IMPORT_BASE QT.designer.depends = xml QT.designer.DEFINES = QT_DESIGNER_LIB diff --git a/qttools/modules/qt_help.pri b/qttools/modules/qt_help.pri index bc5481f..fd387c5 100644 --- a/qttools/modules/qt_help.pri +++ b/qttools/modules/qt_help.pri @@ -9,6 +9,7 @@ QT.help.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtHelp QT.help.private_includes = $$QT_MODULE_INCLUDE_BASE/QtHelp/private QT.help.sources = $$QT_MODULE_BASE/src/assistant/lib QT.help.libs = $$QT_MODULE_LIB_BASE +QT.help.plugins = $$QT_MODULE_PLUGIN_BASE QT.help.imports = $$QT_MODULE_IMPORT_BASE QT.help.depends = network xml sql QT.help.DEFINES = QT_HELP_LIB diff --git a/qttools/src/designer/src/plugins/activeqt/activeqt.pro b/qttools/src/designer/src/plugins/activeqt/activeqt.pro index d71e387..2ed0b10 100644 --- a/qttools/src/designer/src/plugins/activeqt/activeqt.pro +++ b/qttools/src/designer/src/plugins/activeqt/activeqt.pro @@ -1,6 +1,6 @@ TARGET = $$qtLibraryTarget(qaxwidget) TEMPLATE = lib -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/designer +DESTDIR = $$QT.designer.plugins/designer CONFIG += qt warn_on qaxcontainer plugin designer debug_and_release build_all:!build_pass { diff --git a/qttools/src/designer/src/plugins/plugins.pri b/qttools/src/designer/src/plugins/plugins.pri index e2fcfc4..2801e5b 100644 --- a/qttools/src/designer/src/plugins/plugins.pri +++ b/qttools/src/designer/src/plugins/plugins.pri @@ -1,6 +1,6 @@ CONFIG += designer win32|mac: CONFIG+= debug_and_release -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/designer +DESTDIR = $$QT.designer.plugins/designer contains(TEMPLATE, ".*lib"):TARGET = $$qtLibraryTarget($$TARGET) # install diff --git a/qtxmlpatterns/modules/qt_xmlpatterns.pri b/qtxmlpatterns/modules/qt_xmlpatterns.pri index 3f37d50..3c15c46 100644 --- a/qtxmlpatterns/modules/qt_xmlpatterns.pri +++ b/qtxmlpatterns/modules/qt_xmlpatterns.pri @@ -9,6 +9,7 @@ QT.xmlpatterns.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtXm QT.xmlpatterns.private_includes = $$QT_MODULE_INCLUDE_BASE/QtXmlPatterns/private QT.xmlpatterns.sources = $$QT_MODULE_BASE/src/xmlpatterns QT.xmlpatterns.libs = $$QT_MODULE_LIB_BASE +QT.xmlpatterns.plugins = $$QT_MODULE_PLUGIN_BASE QT.xmlpatterns.imports = $$QT_MODULE_IMPORT_BASE QT.xmlpatterns.depends = core network QT.xmlpatterns.DEFINES = QT_XMLPATTERNS_LIB -- 1.7.3.2.343.g7d43d