Merge commit 'qt/master-stable'

Conflicts:
	src/corelib/kernel/qobject.cpp
	src/corelib/tools/qsharedpointer_impl.h
	src/gui/widgets/qdatetimeedit.cpp
	src/gui/widgets/qlinecontrol.cpp
	src/gui/widgets/qlineedit.cpp
	tests/auto/qcssparser/qcssparser.pro
	tests/auto/qicoimageformat/tst_qicoimageformat.cpp
	tests/auto/qmultiscreen/qmultiscreen.pro
	tests/auto/qresourceengine/qresourceengine.pro
	tests/auto/qresourceengine/tst_qresourceengine.cpp
	tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp

1 files changed, 15 insertions, 1 deletions

diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index e6947a0..0f8548a 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -56,6 +56,7 @@
 #include <qvarlengtharray.h>
 #include <qset.h>
 #include <qsemaphore.h>
+#include <qsharedpointer.h>
 
 #include <private/qorderedmutexlocker_p.h>
 #include <private/qmutexpool_p.h>
@@ -794,6 +795,18 @@ QObject::~QObject()
         QObjectPrivate::clearGuards(this);
     }
 
+    if (d->sharedRefcount) {
+        if (d->sharedRefcount->strongref > 0) {
+            qWarning("QObject: shared QObject was deleted directly. The program is malformed and may crash.");
+            // but continue deleting, it's too late to stop anyway
+        }
+
+        // indicate to all QWeakPointers that this QObject has now been deleted
+        d->sharedRefcount->strongref = 0;
+        if (!d->sharedRefcount->weakref.deref())
+            delete d->sharedRefcount;
+    }
+
     QT_TRY {
         emit destroyed(this);
         if (d->declarativeData)
@@ -814,6 +827,7 @@ QObject::~QObject()
 #endif
     }
 
+
     {
         QMutex *signalSlotMutex = 0;
         QT_TRY {
@@ -878,9 +892,9 @@ QObject::~QObject()
             if (senderLists)
                 senderLists->dirty = true;
 
+            node = node->next;
             if (needToUnlock)
                 m->unlock();
-            node = node->next;
         }
     }