summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorVolker Krause <volker.krause@kdab.com>2016-01-07 13:45:18 +0100
committerVolker Krause <volker.krause@kdab.com>2016-01-07 19:26:25 +0000
commit4914a4193c4e28e3db611af03f416d1b59cefef9 (patch)
treee7da33d407e46a3776101db4984b61f6115412a3 /src
parentc765515134e1f7608753806e46e79295135fe1a3 (diff)
Use QFuture::waitForFinished directly.
QFutureWatcher::waitForFinished calls the same internally, but adds additional overhead we don't need here. Saves a couple of allocations per frame. Change-Id: I616a527068fd1c55238ca88b2fc753b423116e32 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src')
-rw-r--r--src/core/jobs/qaspectjobmanager.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/core/jobs/qaspectjobmanager.cpp b/src/core/jobs/qaspectjobmanager.cpp
index 41e4b48eb..32f024acb 100644
--- a/src/core/jobs/qaspectjobmanager.cpp
+++ b/src/core/jobs/qaspectjobmanager.cpp
@@ -44,7 +44,6 @@
#include <QThread>
#include <QCoreApplication>
#include <QtCore/QFuture>
-#include <QtCore/QFutureWatcher>
QT_BEGIN_NAMESPACE
@@ -108,9 +107,7 @@ void QAspectJobManager::enqueueJobs(const QVector<QAspectJobPtr> &jobQueue)
void QAspectJobManager::waitForAllJobs()
{
- QFutureWatcher<void> futureWatcher;
- futureWatcher.setFuture(m_threadPooler->future());
- futureWatcher.waitForFinished();
+ m_threadPooler->future().waitForFinished();
}
void QAspectJobManager::waitForPerThreadFunction(JobFunction func, void *arg)
@@ -125,9 +122,7 @@ void QAspectJobManager::waitForPerThreadFunction(JobFunction func, void *arg)
}
QFuture<void> future = m_threadPooler->mapDependables(taskList);
- QFutureWatcher<void> futureWatcher;
- futureWatcher.setFuture(future);
- futureWatcher.waitForFinished();
+ future.waitForFinished();
}
} // namespace Qt3DCore