Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt

2 files changed, 11 insertions, 5 deletions

diff --git a/src/corelib/kernel/kernel.pri b/src/corelib/kernel/kernel.pri
index d90ecae..68649a6 100644
--- a/src/corelib/kernel/kernel.pri
+++ b/src/corelib/kernel/kernel.pri
@@ -53,7 +53,8 @@ SOURCES += \
 	kernel/qvariant.cpp \
         kernel/qcoreglobaldata.cpp \
         kernel/qsharedmemory.cpp \
-        kernel/qsystemsemaphore.cpp
+        kernel/qsystemsemaphore.cpp \
+        kernel/qpointer.cpp
 
 win32 {
 	SOURCES += \
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 287ac30..9f803fa 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -752,14 +752,18 @@ QObject::~QObject()
         }
 
         // disconnect all senders
-        for (int i = 0; i < d->senders.count(); ++i) {
+        for (int i = 0; i < d->senders.count(); ) {
             QObjectPrivate::Connection *s = d->senders[i];
-            if (!s->sender)
-                continue;
 
             QMutex *m = &s->sender->d_func()->threadData->mutex;
             bool needToUnlock = QOrderedMutexLocker::relock(locker.mutex(), m);
-            s = d->senders[i];
+            if (m < locker.mutex()) {
+                if (i >= d->senders.count() || s != d->senders[i]) {
+                    if (needToUnlock)
+                        m->unlock();
+                    continue;
+                }
+            }
             s->receiver = 0;
             if (s->sender) {
                 QObjectConnectionListVector *senderLists = s->sender->d_func()->connectionLists;
@@ -769,6 +773,7 @@ QObject::~QObject()
 
             if (needToUnlock)
                 m->unlock();
+            ++i;
         }
 
         d->senders.clear();