diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2013-05-15 08:18:05 -0600 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-20 12:06:48 +0200 |
| commit | 6c98035c99700b4cd727fbf1158e346b9a02744c (patch) | |
| tree | 73628b120db8e321bb046a09ba439eef755d6fef /src/corelib | |
| parent | 0cad334ab6c6d3f16edf85dadd0f588be6860740 (diff) | |
QThreadPool: Fix regression from Qt 4 in dealing with priority starts
The optimisation done in cbaf52b09971edf6f3e1458f7dd677b80a1568ed for Qt
5.0 got the order wrong of the comparison. The queue must be sorted in
decreasing priority order. But since higher numbers mean higher
priority, that means the queue must be sorted in decreasing priority
number order.
Task-number: QTBUG-29163
Change-Id: Iaf3424b9bb445bf5c71518927f37253cead454f3
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/thread/qthreadpool.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/thread/qthreadpool.cpp b/src/corelib/thread/qthreadpool.cpp index 1616fb9fab..a7d52f9652 100644 --- a/src/corelib/thread/qthreadpool.cpp +++ b/src/corelib/thread/qthreadpool.cpp @@ -215,7 +215,7 @@ void QThreadPoolPrivate::enqueueTask(QRunnable *runnable, int priority) // put it on the queue QList<QPair<QRunnable *, int> >::const_iterator begin = queue.constBegin(); QList<QPair<QRunnable *, int> >::const_iterator it = queue.constEnd(); - if (it != begin && priority < (*(it - 1)).second) + if (it != begin && priority > (*(it - 1)).second) it = std::upper_bound(begin, --it, priority); queue.insert(it - begin, qMakePair(runnable, priority)); runnableReady.wakeOne(); |