Introduced the QT.<module>.plugins variable to module profiles.

diff --git a/bin/syncqt b/bin/syncqt
index d37d077..45ac9d0 100755 (executable)
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -1013,6 +1013,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/mkspecs/features/qt_config.prf b/mkspecs/features/qt_config.prf
index 0be4dee..5afd82c 100644 (file)
--- a/mkspecs/features/qt_config.prf
+++ b/mkspecs/features/qt_config.prf
@@ -20,6 +20,7 @@ isEmpty(QMAKE_QT_CONFIG)|!exists($$QMAKE_QT_CONFIG) {
          # qt_<module>.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/src/modules/qt_core.pri b/src/modules/qt_core.pri
index dc2ca54..9636fb2 100644 (file)
--- 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 7d3b7f3..13c9914 100644 (file)
--- 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 74d2931..444f5c4 100644 (file)
--- 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 f9474bb..f54afd2 100644 (file)
--- 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 a54c384..4d9a702 100644 (file)
--- 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 19a9a81..1261fd9 100644 (file)
--- 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 c3950b1..e7ca42a 100644 (file)
--- 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 a4f5dd2..6ef7939 100644 (file)
--- 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 d1bd19a..7e1dc7c 100644 (file)
--- 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 5b71e27..d221007 100644 (file)
--- 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 95d9467..0ede3d2 100644 (file)
--- 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 79110cb..092f3ca 100644 (file)
--- 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 dec408c..3ac54c3 100644 (file)
--- 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 90078e9..ae5371a 100644 (file)
--- 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 c967f8c..94ab36c 100644 (file)
--- 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 6700cda..4737045 100644 (file)
--- 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 36dd36d..6df346c 100644 (file)
--- 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 e396263..b3e0883 100644 (file)
--- 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 5dfb6d7..ecf958f 100644 (file)
--- 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 8d92f57..5d2ae1a 100644 (file)
--- 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 b0a8a91..51a2f41 100644 (file)
--- 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 6480e43..e6b7a4b 100644 (file)
--- 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 1cc28d8..14c162c 100644 (file)
--- 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 2ebb94f..b0d5a2b 100644 (file)
--- 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 fb41d7f..a30899a 100644 (file)
--- 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 5879992..151ef88 100644 (file)
--- 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 3cac77d..7f788a3 100644 (file)
--- 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 ad9f6a9..d4dc4bb 100644 (file)
--- 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 74c7fd2..4851521 100644 (file)
--- 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 6fc8a5c..3abe2a7 100644 (file)
--- 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 d397050..54d11ca 100644 (file)
--- 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 242ab07..30cebab 100644 (file)
--- 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 2a376e4..c1cdc0e 100644 (file)
--- 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 675be85..2b5212a 100644 (file)
--- 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 a0996e7..e45319d 100644 (file)
--- 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 173f7e9..f6e0770 100644 (file)
--- 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 31da2f4..48bad8c 100644 (file)
--- 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 0d3cce6..c497ba2 100644 (file)
--- 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 47e15c5..fb3cb53 100644 (file)
--- 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 781cdc4..6f8b139 100644 (file)
--- 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 b8ea12a..6bf9d7a 100644 (file)
--- 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 07472e2..0958a86 100644 (file)
--- 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 439b431..4b72cae 100644 (file)
--- 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 eadff41..cef92ce 100644 (file)
--- 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 fb254b8..3a0e875 100644 (file)
--- 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 88085f3..01dc418 100644 (file)
--- 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 e781526..e4eb21b 100644 (file)
--- 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 f8dcb2c..5d0535f 100644 (file)
--- 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 862a220..c0af91c 100644 (file)
--- 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 ac1c8ff..b8e26b4 100644 (file)
--- 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 b93b25b..d38e3fe 100644 (file)
--- 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 7b0748d..e2fa013 100644 (file)
--- 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 1633ee4..705e604 100644 (file)
--- 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 65c49e3..4a63746 100644 (file)
--- 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 7ad8fd9..3692e38 100644 (file)
--- 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 e08c0c5..4445516 100644 (file)
--- 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 216b899..4e4fe6f 100644 (file)
--- 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 438a88e..c832938 100644 (file)
--- 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 c8ae415..a6e7d76 100644 (file)
--- 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 9d7860a..11e867d 100644 (file)
--- 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 d2b332a..bc17525 100644 (file)
--- 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 07f8d88..a7b8ca5 100644 (file)
--- 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 5945438..6ca5a53 100644 (file)
--- 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 ea77a29..ae02077 100644 (file)
--- 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 4e15102..0cde7d2 100644 (file)
--- 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 2f6943a..64f55fd 100644 (file)
--- 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