diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:09:44 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:10:02 +0100 |
| commit | 77d294db076dac19e8b549b445ffede9f7260c84 (patch) | |
| tree | 828ee7a6862ec5c0bd24f97cb540625a2c647376 /src/core/jobs/qaspectjobmanager.cpp | |
| parent | 59f8fec8a41606b3185fe3a4e276978e3e1ed5ef (diff) | |
| parent | 939b9b4b7591e8a421cf048a0a84ed3e75d81d21 (diff) | |
Merge branch 'dev' into wip/animationwip/animation
Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f
Diffstat (limited to 'src/core/jobs/qaspectjobmanager.cpp')
| -rw-r--r-- | src/core/jobs/qaspectjobmanager.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/core/jobs/qaspectjobmanager.cpp b/src/core/jobs/qaspectjobmanager.cpp index f2a71412d..468d904b4 100644 --- a/src/core/jobs/qaspectjobmanager.cpp +++ b/src/core/jobs/qaspectjobmanager.cpp @@ -38,16 +38,17 @@ ****************************************************************************/ #include "qaspectjobmanager_p.h" -#include "task_p.h" -#include "qthreadpooler_p.h" -#include "dependencyhandler_p.h" - -#include <QAtomicInt> -#include <QDebug> -#include <QThread> -#include <QCoreApplication> + +#include <QtCore/QAtomicInt> +#include <QtCore/QCoreApplication> +#include <QtCore/QDebug> +#include <QtCore/QThread> #include <QtCore/QFuture> +#include <Qt3DCore/private/dependencyhandler_p.h> +#include <Qt3DCore/private/qthreadpooler_p.h> +#include <Qt3DCore/private/task_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DCore { |