diff options
Diffstat (limited to 'src')
66 files changed, 67 insertions, 55 deletions
diff --git a/src/modules/qt_core.pri b/src/modules/qt_core.pri index dc2ca54805..9636fb2500 100644 --- a/src/modules/qt_core.pri +++ b/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/src/modules/qt_dbus.pri b/src/modules/qt_dbus.pri index 7d3b7f367f..13c9914f0d 100644 --- a/src/modules/qt_dbus.pri +++ b/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/src/modules/qt_gui.pri b/src/modules/qt_gui.pri index 74d2931444..444f5c4804 100644 --- a/src/modules/qt_gui.pri +++ b/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/src/modules/qt_network.pri b/src/modules/qt_network.pri index f9474bb36a..f54afd21a0 100644 --- a/src/modules/qt_network.pri +++ b/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/src/modules/qt_opengl.pri b/src/modules/qt_opengl.pri index a54c384377..4d9a7029ef 100644 --- a/src/modules/qt_opengl.pri +++ b/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/src/modules/qt_openvg.pri b/src/modules/qt_openvg.pri index 19a9a81dab..1261fd99c2 100644 --- a/src/modules/qt_openvg.pri +++ b/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/src/modules/qt_sql.pri b/src/modules/qt_sql.pri index c3950b1691..e7ca42a513 100644 --- a/src/modules/qt_sql.pri +++ b/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/src/modules/qt_testlib.pri b/src/modules/qt_testlib.pri index a4f5dd2b01..6ef7939164 100644 --- a/src/modules/qt_testlib.pri +++ b/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/src/modules/qt_uilib.pri b/src/modules/qt_uilib.pri index d1bd19a522..7e1dc7ccd2 100644 --- a/src/modules/qt_uilib.pri +++ b/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/src/modules/qt_uitools.pri b/src/modules/qt_uitools.pri index 5b71e27f7a..d221007684 100644 --- a/src/modules/qt_uitools.pri +++ b/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/src/modules/qt_xml.pri b/src/modules/qt_xml.pri index 95d9467969..0ede3d2ddf 100644 --- a/src/modules/qt_xml.pri +++ b/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/src/plugins/accessible/widgets/widgets.pro b/src/plugins/accessible/widgets/widgets.pro index 79110cbcd4..092f3ca32c 100644 --- a/src/plugins/accessible/widgets/widgets.pro +++ b/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/src/plugins/bearer/connman/connman.pro b/src/plugins/bearer/connman/connman.pro index dec408c724..3ac54c3769 100644 --- a/src/plugins/bearer/connman/connman.pro +++ b/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/src/plugins/bearer/corewlan/corewlan.pro b/src/plugins/bearer/corewlan/corewlan.pro index 90078e9290..ae5371a715 100644 --- a/src/plugins/bearer/corewlan/corewlan.pro +++ b/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/src/plugins/bearer/generic/generic.pro b/src/plugins/bearer/generic/generic.pro index c967f8c6dc..94ab36ce59 100644 --- a/src/plugins/bearer/generic/generic.pro +++ b/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/src/plugins/bearer/icd/icd.pro b/src/plugins/bearer/icd/icd.pro index 6700cdaaa8..4737045ae7 100644 --- a/src/plugins/bearer/icd/icd.pro +++ b/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/src/plugins/bearer/nativewifi/nativewifi.pro b/src/plugins/bearer/nativewifi/nativewifi.pro index 36dd36db19..6df346cd46 100644 --- a/src/plugins/bearer/nativewifi/nativewifi.pro +++ b/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/src/plugins/bearer/networkmanager/networkmanager.pro b/src/plugins/bearer/networkmanager/networkmanager.pro index e39626336c..b3e088344d 100644 --- a/src/plugins/bearer/networkmanager/networkmanager.pro +++ b/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/src/plugins/bearer/nla/nla.pro b/src/plugins/bearer/nla/nla.pro index 5dfb6d7e2d..ecf958f559 100644 --- a/src/plugins/bearer/nla/nla.pro +++ b/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/src/plugins/bearer/symbian/symbian.pri b/src/plugins/bearer/symbian/symbian.pri index 8d92f57b68..5d2ae1a5cd 100644 --- a/src/plugins/bearer/symbian/symbian.pri +++ b/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/src/plugins/codecs/cn/cn.pro b/src/plugins/codecs/cn/cn.pro index b0a8a91779..51a2f41372 100644 --- a/src/plugins/codecs/cn/cn.pro +++ b/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/src/plugins/codecs/jp/jp.pro b/src/plugins/codecs/jp/jp.pro index 6480e43418..e6b7a4bb7f 100644 --- a/src/plugins/codecs/jp/jp.pro +++ b/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/src/plugins/codecs/kr/kr.pro b/src/plugins/codecs/kr/kr.pro index 1cc28d80a5..14c162c6e8 100644 --- a/src/plugins/codecs/kr/kr.pro +++ b/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/src/plugins/codecs/tw/tw.pro b/src/plugins/codecs/tw/tw.pro index 2ebb94f013..b0d5a2b68a 100644 --- a/src/plugins/codecs/tw/tw.pro +++ b/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/src/plugins/decorations/default/default.pro b/src/plugins/decorations/default/default.pro index fb41d7fcda..a30899a62b 100644 --- a/src/plugins/decorations/default/default.pro +++ b/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/src/plugins/decorations/styled/styled.pro b/src/plugins/decorations/styled/styled.pro index 5879992e89..151ef88178 100644 --- a/src/plugins/decorations/styled/styled.pro +++ b/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/src/plugins/decorations/windows/windows.pro b/src/plugins/decorations/windows/windows.pro index 3cac77de31..7f788a3d7e 100644 --- a/src/plugins/decorations/windows/windows.pro +++ b/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/src/plugins/generic/linuxinput/linuxinput.pro b/src/plugins/generic/linuxinput/linuxinput.pro index ad9f6a9754..d4dc4bbbcb 100644 --- a/src/plugins/generic/linuxinput/linuxinput.pro +++ b/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/src/plugins/generic/tslib/tslib.pro b/src/plugins/generic/tslib/tslib.pro index 74c7fd2b96..485152181c 100644 --- a/src/plugins/generic/tslib/tslib.pro +++ b/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/src/plugins/gfxdrivers/ahi/ahi.pro b/src/plugins/gfxdrivers/ahi/ahi.pro index 6fc8a5cc8d..3abe2a76cc 100644 --- a/src/plugins/gfxdrivers/ahi/ahi.pro +++ b/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/src/plugins/gfxdrivers/directfb/directfb.pro b/src/plugins/gfxdrivers/directfb/directfb.pro index d397050bdc..54d11ca159 100644 --- a/src/plugins/gfxdrivers/directfb/directfb.pro +++ b/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/src/plugins/gfxdrivers/eglnullws/eglnullws.pro b/src/plugins/gfxdrivers/eglnullws/eglnullws.pro index 242ab07ecd..30cebab41a 100644 --- a/src/plugins/gfxdrivers/eglnullws/eglnullws.pro +++ b/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/src/plugins/gfxdrivers/linuxfb/linuxfb.pro b/src/plugins/gfxdrivers/linuxfb/linuxfb.pro index 2a376e4158..c1cdc0eda7 100644 --- a/src/plugins/gfxdrivers/linuxfb/linuxfb.pro +++ b/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/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.pro b/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.pro index 675be85460..2b5212a6b3 100644 --- a/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.pro +++ b/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/src/plugins/gfxdrivers/qvfb/qvfb.pro b/src/plugins/gfxdrivers/qvfb/qvfb.pro index a0996e77dc..e45319db87 100644 --- a/src/plugins/gfxdrivers/qvfb/qvfb.pro +++ b/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/src/plugins/gfxdrivers/transformed/transformed.pro b/src/plugins/gfxdrivers/transformed/transformed.pro index 173f7e99d4..f6e07704b3 100644 --- a/src/plugins/gfxdrivers/transformed/transformed.pro +++ b/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/src/plugins/gfxdrivers/vnc/vnc.pro b/src/plugins/gfxdrivers/vnc/vnc.pro index 31da2f404e..48bad8c6e3 100644 --- a/src/plugins/gfxdrivers/vnc/vnc.pro +++ b/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/src/plugins/graphicssystems/meego/meego.pro b/src/plugins/graphicssystems/meego/meego.pro index 0d3cce622f..c497ba2eb6 100644 --- a/src/plugins/graphicssystems/meego/meego.pro +++ b/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/src/plugins/graphicssystems/opengl/opengl.pro b/src/plugins/graphicssystems/opengl/opengl.pro index 47e15c5ec5..fb3cb5331a 100644 --- a/src/plugins/graphicssystems/opengl/opengl.pro +++ b/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/src/plugins/graphicssystems/openvg/openvg.pro b/src/plugins/graphicssystems/openvg/openvg.pro index 781cdc42e3..6f8b13907a 100644 --- a/src/plugins/graphicssystems/openvg/openvg.pro +++ b/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/src/plugins/graphicssystems/shivavg/shivavg.pro b/src/plugins/graphicssystems/shivavg/shivavg.pro index b8ea12ac4a..6bf9d7a975 100644 --- a/src/plugins/graphicssystems/shivavg/shivavg.pro +++ b/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/src/plugins/graphicssystems/trace/trace.pro b/src/plugins/graphicssystems/trace/trace.pro index 07472e2daf..0958a86973 100644 --- a/src/plugins/graphicssystems/trace/trace.pro +++ b/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/src/plugins/imageformats/gif/gif.pro b/src/plugins/imageformats/gif/gif.pro index 439b43136c..4b72cae6e4 100644 --- a/src/plugins/imageformats/gif/gif.pro +++ b/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/src/plugins/imageformats/ico/ico.pro b/src/plugins/imageformats/ico/ico.pro index eadff416e3..cef92cedc8 100644 --- a/src/plugins/imageformats/ico/ico.pro +++ b/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/src/plugins/imageformats/jpeg/jpeg.pro b/src/plugins/imageformats/jpeg/jpeg.pro index fb254b86c6..3a0e8754c0 100644 --- a/src/plugins/imageformats/jpeg/jpeg.pro +++ b/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/src/plugins/imageformats/mng/mng.pro b/src/plugins/imageformats/mng/mng.pro index 88085f363c..01dc418c1b 100644 --- a/src/plugins/imageformats/mng/mng.pro +++ b/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/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro index e78152611c..e4eb21b1e7 100644 --- a/src/plugins/imageformats/tiff/tiff.pro +++ b/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/src/plugins/inputmethods/imsw-multi/imsw-multi.pro b/src/plugins/inputmethods/imsw-multi/imsw-multi.pro index f8dcb2cfcb..5d0535f3ac 100644 --- a/src/plugins/inputmethods/imsw-multi/imsw-multi.pro +++ b/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/src/plugins/kbddrivers/linuxinput/linuxinput.pro b/src/plugins/kbddrivers/linuxinput/linuxinput.pro index 862a22031c..c0af91c7f0 100644 --- a/src/plugins/kbddrivers/linuxinput/linuxinput.pro +++ b/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/src/plugins/mousedrivers/linuxtp/linuxtp.pro b/src/plugins/mousedrivers/linuxtp/linuxtp.pro index ac1c8ff911..b8e26b4483 100644 --- a/src/plugins/mousedrivers/linuxtp/linuxtp.pro +++ b/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/src/plugins/mousedrivers/pc/pc.pro b/src/plugins/mousedrivers/pc/pc.pro index b93b25b8cf..d38e3fe5d1 100644 --- a/src/plugins/mousedrivers/pc/pc.pro +++ b/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/src/plugins/mousedrivers/tslib/tslib.pro b/src/plugins/mousedrivers/tslib/tslib.pro index 7b0748db9f..e2fa013fdb 100644 --- a/src/plugins/mousedrivers/tslib/tslib.pro +++ b/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/src/plugins/platforms/cocoa/cocoa.pro b/src/plugins/platforms/cocoa/cocoa.pro index 1633ee45c7..705e60439e 100644 --- a/src/plugins/platforms/cocoa/cocoa.pro +++ b/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/src/plugins/platforms/directfb/directfb.pro b/src/plugins/platforms/directfb/directfb.pro index 65c49e386f..4a637463ef 100644 --- a/src/plugins/platforms/directfb/directfb.pro +++ b/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/src/plugins/platforms/eglfs/eglfs.pro b/src/plugins/platforms/eglfs/eglfs.pro index 7ad8fd985b..3692e38e1b 100644 --- a/src/plugins/platforms/eglfs/eglfs.pro +++ b/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/src/plugins/platforms/fb_base/fb_base.pro b/src/plugins/platforms/fb_base/fb_base.pro index e08c0c5571..4445516cc7 100644 --- a/src/plugins/platforms/fb_base/fb_base.pro +++ b/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/src/plugins/platforms/linuxfb/linuxfb.pro b/src/plugins/platforms/linuxfb/linuxfb.pro index 216b899fdb..4e4fe6ff4b 100644 --- a/src/plugins/platforms/linuxfb/linuxfb.pro +++ b/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/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro index 438a88e95f..c8329387bf 100644 --- a/src/plugins/platforms/minimal/minimal.pro +++ b/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/src/plugins/platforms/openkode/openkode.pro b/src/plugins/platforms/openkode/openkode.pro index c8ae4154c3..a6e7d7665a 100644 --- a/src/plugins/platforms/openkode/openkode.pro +++ b/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/src/plugins/platforms/openvglite/openvglite.pro b/src/plugins/platforms/openvglite/openvglite.pro index 9d7860abe7..11e867d998 100644 --- a/src/plugins/platforms/openvglite/openvglite.pro +++ b/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/src/plugins/platforms/qvfb/qvfb.pro b/src/plugins/platforms/qvfb/qvfb.pro index d2b332a6d5..bc17525104 100644 --- a/src/plugins/platforms/qvfb/qvfb.pro +++ b/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/src/plugins/platforms/vnc/vnc.pro b/src/plugins/platforms/vnc/vnc.pro index 07f8d888fd..a7b8ca540a 100644 --- a/src/plugins/platforms/vnc/vnc.pro +++ b/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/src/plugins/platforms/wayland/wayland.pro b/src/plugins/platforms/wayland/wayland.pro index 59454384c2..6ca5a53e06 100644 --- a/src/plugins/platforms/wayland/wayland.pro +++ b/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/src/plugins/platforms/xlib/xlib.pro b/src/plugins/platforms/xlib/xlib.pro index ea77a2905b..ae02077100 100644 --- a/src/plugins/platforms/xlib/xlib.pro +++ b/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/src/plugins/s60/s60pluginbase.pri b/src/plugins/s60/s60pluginbase.pri index 4e1510299b..0cde7d2277 100644 --- a/src/plugins/s60/s60pluginbase.pri +++ b/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/src/plugins/sqldrivers/qsqldriverbase.pri b/src/plugins/sqldrivers/qsqldriverbase.pri index 2f6943ab9a..64f55fda78 100644 --- a/src/plugins/sqldrivers/qsqldriverbase.pri +++ b/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 |