Merge branch 'stable' into dev

Conflicts:
	tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp

Change-Id: I6b8d505fc22f052c307ca27f58f7d16f98965f47

1 files changed, 7 insertions, 0 deletions

diff --git a/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp b/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
index 8dfffebacd..086f0b49ca 100644
--- a/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
+++ b/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
@@ -50,6 +50,7 @@
 
 #include "externaltests.h"
 #include "forwarddeclared.h"
+#include "nontracked.h"
 #include "wrapper.h"
 
 #include <stdlib.h>
@@ -88,6 +89,7 @@ private slots:
     void dynamicCastDifferentPointers();
     void dynamicCastVirtualBase();
     void dynamicCastFailure();
+    void dynamicCastFailureNoLeak();
 #endif
     void constCorrectness();
     void customDeleter();
@@ -1110,6 +1112,11 @@ void tst_QSharedPointer::dynamicCastFailure()
     QCOMPARE(int(refCountData(baseptr)->weakref.load()), 1);
     QCOMPARE(int(refCountData(baseptr)->strongref.load()), 1);
 }
+
+void tst_QSharedPointer::dynamicCastFailureNoLeak()
+{
+    NonTracked::dynamicCastFailureNoLeak();
+}
 #endif
 
 void tst_QSharedPointer::constCorrectness()