diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-09-12 12:10:03 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-09-12 12:39:05 +0100 |
| commit | 3f03499bf8a7cf3c3f8d19a020179c1205980bde (patch) | |
| tree | 518b0ef3fb1b31d3856f43124150ef41acb8c1aa /src/core/jobs/task.cpp | |
| parent | 8a4b9ebadb9e63ae367694f04786c7faf6306f27 (diff) | |
| parent | bf5fd7a78c91e29332ce70ad844b756150f32f18 (diff) | |
Merge branch '5.9' into 5.10
Change-Id: Id6a3d4ec579a2f2a2e559c22a2293d0e184f0bdf
Diffstat (limited to 'src/core/jobs/task.cpp')
| -rw-r--r-- | src/core/jobs/task.cpp | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/src/core/jobs/task.cpp b/src/core/jobs/task.cpp index cbaa993b1..4291a4779 100644 --- a/src/core/jobs/task.cpp +++ b/src/core/jobs/task.cpp @@ -43,7 +43,6 @@ #include <QtCore/QElapsedTimer> #include <QtCore/QMutexLocker> -#include <Qt3DCore/private/dependencyhandler_p.h> #include <Qt3DCore/private/qthreadpooler_p.h> QT_BEGIN_NAMESPACE @@ -57,8 +56,7 @@ RunnableInterface::~RunnableInterface() // Aspect task AspectTaskRunnable::AspectTaskRunnable() - : m_dependencyHandler(nullptr) - , m_pooler(nullptr) + : m_pooler(nullptr) , m_reserved(false) { } @@ -94,16 +92,6 @@ void AspectTaskRunnable::run() m_pooler->taskFinished(this); } -void AspectTaskRunnable::setDependencyHandler(DependencyHandler *handler) -{ - m_dependencyHandler = handler; -} - -DependencyHandler *AspectTaskRunnable::dependencyHandler() -{ - return m_dependencyHandler; -} - // Synchronized task SyncTaskRunnable::SyncTaskRunnable(QAbstractAspectJobManager::JobFunction func, @@ -137,16 +125,6 @@ void SyncTaskRunnable::run() m_pooler->taskFinished(this); } -void SyncTaskRunnable::setDependencyHandler(DependencyHandler *handler) -{ - Q_UNUSED(handler); -} - -DependencyHandler *SyncTaskRunnable::dependencyHandler() -{ - return nullptr; -} - } // namespace Qt3DCore { QT_END_NAMESPACE |