diff options
| author | Mika Salmela <mika.salmela@theqtcompany.com> | 2015-02-16 13:54:03 +0200 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2015-02-19 17:08:33 +0000 |
| commit | cb7753f3ffa85eed0fbd98cb2e4f0e453c595d6d (patch) | |
| tree | b2394b4bf977d56a22f8035381353343d6ab5a83 /src/core/jobs/qaspectjobmanager_p.h | |
| parent | b7b9c97c54a58405fba017366236510650200b69 (diff) | |
Removes ThreadWeaver code from Qt3D
Qt3D will be published with commercial licenses and there can't be
3rd party LGPL code. This task will remove the ThreadWeaver code and
places the adaptation code inside configuration.
Change-Id: I316f23087cdd8fed0afafbb1a3d78e3ff159585a
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/core/jobs/qaspectjobmanager_p.h')
| -rw-r--r-- | src/core/jobs/qaspectjobmanager_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/jobs/qaspectjobmanager_p.h b/src/core/jobs/qaspectjobmanager_p.h index cde0351bf..5ea9cc54a 100644 --- a/src/core/jobs/qaspectjobmanager_p.h +++ b/src/core/jobs/qaspectjobmanager_p.h @@ -39,14 +39,14 @@ #include <private/qabstractaspectjobmanager_p.h> -#ifdef THREAD_POOLER #include "qthreadpooler_p.h" #include "dependencyhandler_p.h" -#endif +#ifdef THREAD_WEAVER namespace ThreadWeaver { class Queue; } +#endif QT_BEGIN_NAMESPACE @@ -62,15 +62,15 @@ public: Q_DECLARE_PUBLIC(QAspectJobManager) QAspectJobManager *q_ptr; +#ifdef THREAD_WEAVER // Owned by QAspectJobManager via QObject parent-child ThreadWeaver::Queue *m_weaver; +#endif -#ifdef THREAD_POOLER QThreadPooler *m_threadPooler; DependencyHandler *m_dependencyHandler; QMutex *m_syncMutex; QWaitCondition m_syncFinished; -#endif }; } // Qt3D |