summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-11-13 07:41:37 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-11-13 07:41:37 (GMT)
commit20fb6a8292583f2cdaa171b59b8e8739ca1f8705 (patch)
tree0e89f25b5bfd70edab31853ac449e8e76ad7a3f0 /src/declarative/qml
parent166060d9039f2562c93ebc9679599933a7cb2e24 (diff)
parent98d06d8d10919e0a83d29bd88f0b572b9b4a753c (diff)
downloadQt-20fb6a8292583f2cdaa171b59b8e8739ca1f8705.zip
Qt-20fb6a8292583f2cdaa171b59b8e8739ca1f8705.tar.gz
Qt-20fb6a8292583f2cdaa171b59b8e8739ca1f8705.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml')
-rw-r--r--src/declarative/qml/qmlenginedebug.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlenginedebug.cpp b/src/declarative/qml/qmlenginedebug.cpp
index 78b166e..6871236 100644
--- a/src/declarative/qml/qmlenginedebug.cpp
+++ b/src/declarative/qml/qmlenginedebug.cpp
@@ -358,7 +358,7 @@ void QmlEngineDebugServer::messageReceived(const QByteArray &message)
QByteArray reply;
QDataStream rs(&reply, QIODevice::WriteOnly);
- rs << QByteArray("WATCH_OBJECT_R") << queryId << objectId << ok;
+ rs << QByteArray("WATCH_OBJECT_R") << queryId << ok;
sendMessage(reply);
} else if (type == "WATCH_PROPERTY") {