summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-04-15 07:59:55 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-04-15 07:59:55 (GMT)
commit4bcd23c4a9d5a596d0c90dbb1569385f30fadbac (patch)
tree528b256b294db80e54d44bd7c95b1881eeed5d1f /tools
parent2980c4534b231c38584f88699d356ea26bb5266b (diff)
parent81044282befaa5af7247804c7875df83c89c6459 (diff)
downloadQt-4bcd23c4a9d5a596d0c90dbb1569385f30fadbac.zip
Qt-4bcd23c4a9d5a596d0c90dbb1569385f30fadbac.tar.gz
Qt-4bcd23c4a9d5a596d0c90dbb1569385f30fadbac.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: QmlDebug: Fix license headers in new ost plugin Fixed autotest after b4b85257ccff6ba21bcbcbd46a9f7f09884abe79 Resolve unqualified attached properties correctly Adding plugin qmltooling/qmlostplugin for QML debugging over OST (USB) on Symbian. QmlDebug: Rename 'tcpserver' library to 'qmldbg_tcp' QDeclarativeDebug: Don't crash when connection is closed Fix so concurrent jobs produce the correct model results Fix uninitialized variable.
Diffstat (limited to 'tools')
-rw-r--r--tools/qml/qml.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro
index b1d56ea..84ebba8 100644
--- a/tools/qml/qml.pro
+++ b/tools/qml/qml.pro
@@ -39,7 +39,7 @@ symbian {
TARGET.CAPABILITY = NetworkServices ReadUserData
# Deploy plugin for remote debugging
- qmldebuggingplugin.sources = $$QT_BUILD_TREE/plugins/qmltooling/tcpserver$${QT_LIBINFIX}.dll
+ qmldebuggingplugin.sources = $$QT_BUILD_TREE/plugins/qmltooling/qmldbg_tcp$${QT_LIBINFIX}.dll $$QT_BUILD_TREE/plugins/qmltooling/qmldbg_ost$${QT_LIBINFIX}.dll
qmldebuggingplugin.path = c:$$QT_PLUGINS_BASE_DIR/qmltooling
DEPLOYMENT += qmldebuggingplugin
}