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/task_p.h | |
parent | 59f8fec8a41606b3185fe3a4e276978e3e1ed5ef (diff) | |
parent | 939b9b4b7591e8a421cf048a0a84ed3e75d81d21 (diff) |
Merge branch 'dev' into wip/animationwip/animation
Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f
Diffstat (limited to 'src/core/jobs/task_p.h')
-rw-r--r-- | src/core/jobs/task_p.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/core/jobs/task_p.h b/src/core/jobs/task_p.h index 593d7d7ad..8193abaf6 100644 --- a/src/core/jobs/task_p.h +++ b/src/core/jobs/task_p.h @@ -51,13 +51,12 @@ // We mean it. // -#include "qaspectjobmanager_p.h" - -#include <QtCore/QtGlobal> -#include <QtCore/QThread> +#include <QtCore/QRunnable> #include <QtCore/QSharedPointer> +#include <QtCore/QThread> +#include <QtCore/QtGlobal> -#include <QtCore/QRunnable> +#include <Qt3DCore/private/qaspectjobmanager_p.h> QT_BEGIN_NAMESPACE |