Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

4 files changed, 17 insertions, 6 deletions

diff --git a/src/declarative/debugger/qmldebug.cpp b/src/declarative/debugger/qmldebug.cpp
index de97cda..a515c1d 100644
--- a/src/declarative/debugger/qmldebug.cpp
+++ b/src/declarative/debugger/qmldebug.cpp
@@ -105,9 +105,10 @@ void QmlEngineDebugPrivate::decode(QDataStream &ds, QmlDebugObjectReference &o,
         QmlEngineDebugServer::QmlObjectProperty data;
         ds >> data;
         QmlDebugPropertyReference prop;
+        prop.m_objectDebugId = o.m_debugId;
         prop.m_name = data.name;
         prop.m_binding = data.binding;
-        prop.m_objectDebugId = o.m_debugId;
+        prop.m_hasNotifySignal = data.hasNotifySignal;
         if (data.type == QmlEngineDebugServer::QmlObjectProperty::Basic)
             prop.m_value = data.value;
         else if (data.type == QmlEngineDebugServer::QmlObjectProperty::Object) {
@@ -343,6 +344,7 @@ void QmlEngineDebug::removeWatch(QmlDebugWatch *watch)
 {
     Q_D(QmlEngineDebug);
 
+    watch->setState(QmlDebugWatch::Inactive);
     d->watched.remove(watch->queryId());
 
     if (d->client->isConnected()) {
@@ -741,18 +743,18 @@ void QmlDebugFileReference::setColumnNumber(int c)
 }
 
 QmlDebugPropertyReference::QmlDebugPropertyReference()
-: m_objectDebugId(-1)
+: m_objectDebugId(-1), m_hasNotifySignal(false)
 {
 }
 
 QmlDebugPropertyReference::QmlDebugPropertyReference(const QmlDebugPropertyReference &o)
-: m_objectDebugId(o.m_objectDebugId), m_name(o.m_name), m_value(o.m_value), m_binding(o.m_binding)
+: m_objectDebugId(o.m_objectDebugId), m_name(o.m_name), m_value(o.m_value), m_binding(o.m_binding), m_hasNotifySignal(o.m_hasNotifySignal)
 {
 }
 
 QmlDebugPropertyReference &QmlDebugPropertyReference::operator=(const QmlDebugPropertyReference &o)
 {
-    m_objectDebugId = o.m_objectDebugId; m_name = o.m_name; m_value = o.m_value; m_binding = o.m_binding;
+    m_objectDebugId = o.m_objectDebugId; m_name = o.m_name; m_value = o.m_value; m_binding = o.m_binding; m_hasNotifySignal = o.m_hasNotifySignal;
     return *this;
 }
 
@@ -775,3 +777,8 @@ QString QmlDebugPropertyReference::binding() const
 {
     return m_binding;
 }
+
+bool QmlDebugPropertyReference::hasNotifySignal() const
+{
+    return m_hasNotifySignal;
+}
diff --git a/src/declarative/debugger/qmldebug.h b/src/declarative/debugger/qmldebug.h
index be28a7e..9fd5fae 100644
--- a/src/declarative/debugger/qmldebug.h
+++ b/src/declarative/debugger/qmldebug.h
@@ -229,6 +229,7 @@ public:
     QString name() const;
     QVariant value() const;
     QString binding() const;
+    bool hasNotifySignal() const;
 
 private:
     friend class QmlEngineDebugPrivate;
@@ -236,6 +237,7 @@ private:
     QString m_name;
     QVariant m_value;
     QString m_binding;
+    bool m_hasNotifySignal;
 };
 
 
diff --git a/src/declarative/qml/qmlenginedebug.cpp b/src/declarative/qml/qmlenginedebug.cpp
index 7896afe..9f0bae6 100644
--- a/src/declarative/qml/qmlenginedebug.cpp
+++ b/src/declarative/qml/qmlenginedebug.cpp
@@ -80,7 +80,7 @@ QDataStream &operator>>(QDataStream &ds,
 QDataStream &operator<<(QDataStream &ds, 
                         const QmlEngineDebugServer::QmlObjectProperty &data)
 {
-    ds << (int)data.type << data.name << data.value << data.binding;
+    ds << (int)data.type << data.name << data.value << data.binding << data.hasNotifySignal;
     return ds;
 }
 
@@ -88,7 +88,7 @@ QDataStream &operator>>(QDataStream &ds,
                         QmlEngineDebugServer::QmlObjectProperty &data)
 {
     int type;
-    ds >> type >> data.name >> data.value >> data.binding;
+    ds >> type >> data.name >> data.value >> data.binding >> data.hasNotifySignal;
     data.type = (QmlEngineDebugServer::QmlObjectProperty::Type)type;
     return ds;
 }
@@ -102,6 +102,7 @@ QmlEngineDebugServer::propertyData(QObject *obj, int propIdx)
 
     rv.type = QmlObjectProperty::Unknown;
     rv.name = prop.name();
+    rv.hasNotifySignal = prop.hasNotifySignal();
     QmlAbstractBinding *binding = QmlMetaProperty(obj, rv.name).binding();
     if (binding)
         rv.binding = binding->expression();
diff --git a/src/declarative/qml/qmlenginedebug_p.h b/src/declarative/qml/qmlenginedebug_p.h
index f935c04..e2f903c 100644
--- a/src/declarative/qml/qmlenginedebug_p.h
+++ b/src/declarative/qml/qmlenginedebug_p.h
@@ -86,6 +86,7 @@ public:
         QString name;
         QVariant value;
         QString binding;
+        bool hasNotifySignal;
     };
 
     static void addEngine(QmlEngine *);