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

diff --git a/modules/qt_declarative.pri b/modules/qt_declarative.pri
index 01c525d..d4dfecd 100644 (file)
--- a/modules/qt_declarative.pri
+++ b/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/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro
index e8ab962..25f05c2 100644 (file)
--- a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro
+++ b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.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 += \