summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-11-13 07:07:37 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-11-13 07:07:37 (GMT)
commite69387f3d3423526f61149bacd93686889fd24ca (patch)
treeb29f18ca258b24bea35174a08b495a0114a9e58b /src/declarative/qml
parent2ecf32919fd3747f537df14c938d2520d240a993 (diff)
parent543c9ab8f423297601def9344b2847f283d87169 (diff)
downloadQt-e69387f3d3423526f61149bacd93686889fd24ca.zip
Qt-e69387f3d3423526f61149bacd93686889fd24ca.tar.gz
Qt-e69387f3d3423526f61149bacd93686889fd24ca.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") {