1 files changed, 20 insertions, 0 deletions
diff --git a/tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp b/tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp
index 152aa4abdd..5b7242fddb 100644
--- a/tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp
+++ b/tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp
@@ -960,6 +960,21 @@ void tst_QThreadPool::cancel()
     QSemaphore sem(0);
     QSemaphore startedThreads(0);
 
+    class SemaphoreReleaser
+    {
+        QSemaphore &sem;
+        int n;
+        Q_DISABLE_COPY(SemaphoreReleaser)
+    public:
+        explicit SemaphoreReleaser(QSemaphore &sem, int n)
+            : sem(sem), n(n) {}
+
+        ~SemaphoreReleaser()
+        {
+            sem.release(n);
+        }
+    };
+
     class BlockingRunnable : public QRunnable
     {
     public:
@@ -995,6 +1010,11 @@ void tst_QThreadPool::cancel()
     QThreadPool threadPool;
     threadPool.setMaxThreadCount(MaxThreadCount);
     BlockingRunnable *runnables[runs];
+
+    // ensure that the QThreadPool doesn't deadlock if any of the checks fail
+    // and cause an early return:
+    const SemaphoreReleaser semReleaser(sem, runs);
+
     count.store(0);
     QAtomicInt dtorCounter = 0;
     QAtomicInt runCounter = 0;