summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorYann Bodson <yann.bodson@nokia.com>2009-11-13 06:43:47 (GMT)
committerYann Bodson <yann.bodson@nokia.com>2009-11-13 06:43:47 (GMT)
commit543c9ab8f423297601def9344b2847f283d87169 (patch)
tree7ae09176a376ac9cc67985124bc8b2e27a9b32b3 /src
parentba6180ee3fa07590f0de419ae7f41e20b4a7504e (diff)
parent6ee194e7a032ddf3cc175fc7adc44a43de00371d (diff)
downloadQt-543c9ab8f423297601def9344b2847f283d87169.zip
Qt-543c9ab8f423297601def9344b2847f283d87169.tar.gz
Qt-543c9ab8f423297601def9344b2847f283d87169.tar.bz2
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src')
-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") {