1 files changed, 62 insertions, 0 deletions
diff --git a/tests/auto/corelib/thread/qthread/tst_qthread.cpp b/tests/auto/corelib/thread/qthread/tst_qthread.cpp
index d4950cd42b..b9c5eeb243 100644
--- a/tests/auto/corelib/thread/qthread/tst_qthread.cpp
+++ b/tests/auto/corelib/thread/qthread/tst_qthread.cpp
@@ -28,6 +28,7 @@
 
 #include <QTest>
 #include <QTestEventLoop>
+#include <QSignalSpy>
 #include <QSemaphore>
 #include <QAbstractEventDispatcher>
 #include <QWinEventNotifier>
@@ -111,6 +112,7 @@ private slots:
     void quitLock();
 
     void create();
+    void createDestruction();
     void threadIdReuse();
 };
 
@@ -1591,6 +1593,66 @@ void tst_QThread::create()
 #endif // QT_CONFIG(cxx11_future)
 }
 
+void tst_QThread::createDestruction()
+{
+    for (int delay : {0, 10, 20}) {
+        auto checkForInterruptions = []() {
+            for (;;) {
+                if (QThread::currentThread()->isInterruptionRequested())
+                    return;
+                QThread::msleep(1);
+            }
+        };
+
+        QScopedPointer<QThread> thread(QThread::create(checkForInterruptions));
+        QSignalSpy finishedSpy(thread.get(), &QThread::finished);
+        QVERIFY(finishedSpy.isValid());
+
+        thread->start();
+        if (delay)
+            QThread::msleep(delay);
+        thread.reset();
+
+        QCOMPARE(finishedSpy.size(), 1);
+    }
+
+    for (int delay : {0, 10, 20}) {
+        auto runEventLoop = []() {
+            QEventLoop loop;
+            loop.exec();
+        };
+
+        QScopedPointer<QThread> thread(QThread::create(runEventLoop));
+        QSignalSpy finishedSpy(thread.get(), &QThread::finished);
+        QVERIFY(finishedSpy.isValid());
+
+        thread->start();
+        if (delay)
+            QThread::msleep(delay);
+        thread.reset();
+
+        QCOMPARE(finishedSpy.size(), 1);
+    }
+
+    for (int delay : {0, 10, 20}) {
+        auto runEventLoop = [delay]() {
+            if (delay)
+                QThread::msleep(delay);
+            QEventLoop loop;
+            loop.exec();
+        };
+
+        QScopedPointer<QThread> thread(QThread::create(runEventLoop));
+        QSignalSpy finishedSpy(thread.get(), &QThread::finished);
+        QVERIFY(finishedSpy.isValid());
+
+        thread->start();
+        thread.reset();
+
+        QCOMPARE(finishedSpy.size(), 1);
+    }
+}
+
 class StopableJob : public QObject
 {
     Q_OBJECT