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

2 files changed, 11 insertions, 11 deletions

diff --git a/src/declarative/qml/qmlbindingvme.cpp b/src/declarative/qml/qmlbindingvme.cpp
index b4b8dc1..29391a6 100644
--- a/src/declarative/qml/qmlbindingvme.cpp
+++ b/src/declarative/qml/qmlbindingvme.cpp
@@ -383,8 +383,8 @@ inline void subscribe(QObject *o, int notifyIndex,
     QmlBindingVME::Config::Subscription *s = config->subscriptions + subIndex;
     if (o != s->source || notifyIndex != s->notifyIndex)  {
         if (s->source)
-            QMetaObject::disconnect(s->source, s->notifyIndex, 
-                                    config->target, config->targetSlot + subIndex);
+            QMetaObject::disconnectOne(s->source, s->notifyIndex, 
+                                       config->target, config->targetSlot + subIndex);
         s->source = o;
         s->notifyIndex = notifyIndex;
         if (s->source && s->notifyIndex != -1) 
diff --git a/src/declarative/qml/qmlexpression.cpp b/src/declarative/qml/qmlexpression.cpp
index 22a9c36f..cd6f582 100644
--- a/src/declarative/qml/qmlexpression.cpp
+++ b/src/declarative/qml/qmlexpression.cpp
@@ -641,9 +641,9 @@ void QmlExpressionPrivate::clearGuards()
 
     for (int ii = 0; ii < data->guardListLength; ++ii) {
         if (data->guardList[ii].data()) {
-            QMetaObject::disconnect(data->guardList[ii].data(), 
-                                    data->guardList[ii].notifyIndex, 
-                                    q, notifyIdx);
+            QMetaObject::disconnectOne(data->guardList[ii].data(), 
+                                       data->guardList[ii].notifyIndex, 
+                                       q, notifyIdx);
         }
     }
 
@@ -684,9 +684,9 @@ void QmlExpressionPrivate::updateGuards(const QPODVector<QmlEnginePrivate::Captu
             }
         } else if(data->guardList[ii].data() && !data->guardList[ii].isDuplicate) {
             // Cache miss
-            QMetaObject::disconnect(data->guardList[ii].data(), 
-                                    data->guardList[ii].notifyIndex, 
-                                    q, notifyIdx);
+            QMetaObject::disconnectOne(data->guardList[ii].data(), 
+                                       data->guardList[ii].notifyIndex, 
+                                       q, notifyIdx);
         } 
         /* else {
             // Cache miss, but nothing to do
@@ -732,9 +732,9 @@ void QmlExpressionPrivate::updateGuards(const QPODVector<QmlEnginePrivate::Captu
 
     for (int ii = properties.count(); ii < data->guardListLength; ++ii) {
         if (data->guardList[ii].data() && !data->guardList[ii].isDuplicate) {
-            QMetaObject::disconnect(data->guardList[ii].data(), 
-                                    data->guardList[ii].notifyIndex, 
-                                    q, notifyIdx);
+            QMetaObject::disconnectOne(data->guardList[ii].data(), 
+                                       data->guardList[ii].notifyIndex, 
+                                       q, notifyIdx);
         }
     }