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/qthreadpooler_p.h | |
parent | 8a4b9ebadb9e63ae367694f04786c7faf6306f27 (diff) | |
parent | bf5fd7a78c91e29332ce70ad844b756150f32f18 (diff) |
Merge branch '5.9' into 5.10
Change-Id: Id6a3d4ec579a2f2a2e559c22a2293d0e184f0bdf
Diffstat (limited to 'src/core/jobs/qthreadpooler_p.h')
-rw-r--r-- | src/core/jobs/qthreadpooler_p.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/core/jobs/qthreadpooler_p.h b/src/core/jobs/qthreadpooler_p.h index 5a2104cdd..00742f8fc 100644 --- a/src/core/jobs/qthreadpooler_p.h +++ b/src/core/jobs/qthreadpooler_p.h @@ -57,7 +57,6 @@ #include <QtCore/QSharedPointer> #include <QtCore/QThreadPool> -#include <Qt3DCore/private/dependencyhandler_p.h> #include <Qt3DCore/private/qaspectjob_p.h> #include <Qt3DCore/private/task_p.h> @@ -81,8 +80,6 @@ public: void taskFinished(RunnableInterface *task); QFuture<void> future(); - void setDependencyHandler(DependencyHandler *handler); - int maxThreadCount() const; #if QT_CONFIG(qt3d_profile_jobs) static QElapsedTimer m_jobsStatTimer; @@ -105,7 +102,6 @@ private: private: QFutureInterface<void> *m_futureInterface; QMutex m_mutex; - DependencyHandler *m_dependencyHandler; QAtomicInt m_taskCount; QThreadPool m_threadPool; }; |