Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

2 files changed, 19 insertions, 9 deletions

diff --git a/src/declarative/qml/qdeclarativeexpression.cpp b/src/declarative/qml/qdeclarativeexpression.cpp
index 609eb39..20863c7 100644
--- a/src/declarative/qml/qdeclarativeexpression.cpp
+++ b/src/declarative/qml/qdeclarativeexpression.cpp
@@ -95,7 +95,13 @@ QDeclarativeExpressionPrivate::QDeclarativeExpressionPrivate(QDeclarativeExpress
 
 QDeclarativeExpressionPrivate::~QDeclarativeExpressionPrivate()
 {
-    if (data) { data->q = 0; data->release(); data = 0; }
+    if (data) { 
+        delete [] data->guardList; 
+        data->guardList = 0; 
+        data->q = 0; 
+        data->release(); 
+        data = 0; 
+    }
 }
 
 void QDeclarativeExpressionPrivate::init(QDeclarativeContextData *ctxt, const QString &expr, 
diff --git a/src/declarative/qml/qdeclarativenotifier_p.h b/src/declarative/qml/qdeclarativenotifier_p.h
index a0e6b43..2a8087e 100644
--- a/src/declarative/qml/qdeclarativenotifier_p.h
+++ b/src/declarative/qml/qdeclarativenotifier_p.h
@@ -112,18 +112,22 @@ private:
 QDeclarativeNotifier::QDeclarativeNotifier()
 : endpoints(0)
 {
-    QDeclarativeNotifierEndpoint *endpoint = endpoints;
-    while (endpoint) {
-        QDeclarativeNotifierEndpoint *next = endpoint->asNotifier()->next;
-        endpoint->asNotifier()->next = 0;
-        endpoint->asNotifier()->prev = 0;
-        endpoint->asNotifier()->notifier = 0;
-        endpoint = next;
-    }
 }
 
 QDeclarativeNotifier::~QDeclarativeNotifier()
 {    
+    QDeclarativeNotifierEndpoint *endpoint = endpoints;
+    while (endpoint) {
+        QDeclarativeNotifierEndpoint::Notifier *n = endpoint->asNotifier();
+        endpoint = n->next;
+
+        n->next = 0;
+        n->prev = 0;
+        n->notifier = 0;
+        if (n->disconnected) *n->disconnected = 0;
+        n->disconnected = 0;
+    }
+    endpoints = 0;
 }
 
 void QDeclarativeNotifier::notify()