QThreadPool::cancel() to remove individual jobs from the job queue.

[ChangeLog][QtCore][QThreadPool] Added QThreadPool::cancel() which allows
removing from the job queue a job that hasn't been started yet.

Change-Id: Ib8f1c1f32a34f5eec8338c641d820b928e470164
Reviewed-by: Nick Shaforostoff <shafff@ukr.net>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/src/corelib/thread/qfutureinterface.cpp b/src/corelib/thread/qfutureinterface.cpp
index 1f417d3d74..a23c32a73b 100644
--- a/src/corelib/thread/qfutureinterface.cpp
+++ b/src/corelib/thread/qfutureinterface.cpp
@@ -292,7 +292,7 @@ void QFutureInterfaceBase::waitForResult(int resultIndex)
 
     // To avoid deadlocks and reduce the number of threads used, try to
     // run the runnable in the current thread.
-    d->pool()->d_func()->stealRunnable(d->runnable);
+    d->pool()->d_func()->stealAndRunRunnable(d->runnable);
 
     lock.relock();
 
@@ -313,7 +313,7 @@ void QFutureInterfaceBase::waitForFinished()
     lock.unlock();
 
     if (!alreadyFinished) {
-        d->pool()->d_func()->stealRunnable(d->runnable);
+        d->pool()->d_func()->stealAndRunRunnable(d->runnable);
 
         lock.relock();