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/aspects/qaspectmanager.cpp | |
| parent | 59f8fec8a41606b3185fe3a4e276978e3e1ed5ef (diff) | |
| parent | 939b9b4b7591e8a421cf048a0a84ed3e75d81d21 (diff) | |
Merge branch 'dev' into wip/animationwip/animation
Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f
Diffstat (limited to 'src/core/aspects/qaspectmanager.cpp')
| -rw-r--r-- | src/core/aspects/qaspectmanager.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/core/aspects/qaspectmanager.cpp b/src/core/aspects/qaspectmanager.cpp index 98fb982df..5ccc89b9e 100644 --- a/src/core/aspects/qaspectmanager.cpp +++ b/src/core/aspects/qaspectmanager.cpp @@ -38,27 +38,27 @@ ****************************************************************************/ #include "qaspectmanager_p.h" -#include "qabstractaspect.h" -#include "qabstractaspect_p.h" -#include "qchangearbiter_p.h" -// TODO Make the kind of job manager configurable (e.g. ThreadWeaver vs Intel TBB) -#include "qaspectjobmanager_p.h" -#include "qabstractaspectjobmanager_p.h" -#include "qentity.h" -#include <Qt3DCore/private/qservicelocator_p.h> +#include <Qt3DCore/qabstractaspect.h> +#include <Qt3DCore/qentity.h> +#include <QtCore/QEventLoop> +#include <QtCore/QThread> +#include <QtCore/QWaitCondition> +#include <QtGui/QSurface> -#include <Qt3DCore/private/qaspectjob_p.h> -#include <Qt3DCore/private/qthreadpooler_p.h> -#include <Qt3DCore/private/qtickclockservice_p.h> #include <Qt3DCore/private/corelogging_p.h> +#include <Qt3DCore/private/qabstractaspect_p.h> +#include <Qt3DCore/private/qabstractaspectjobmanager_p.h> +#include <Qt3DCore/private/qabstractframeadvanceservice_p.h> +// TODO Make the kind of job manager configurable (e.g. ThreadWeaver vs Intel TBB) +#include <Qt3DCore/private/qaspectjobmanager_p.h> +#include <Qt3DCore/private/qaspectjob_p.h> +#include <Qt3DCore/private/qchangearbiter_p.h> #include <Qt3DCore/private/qscheduler_p.h> +#include <Qt3DCore/private/qservicelocator_p.h> +#include <Qt3DCore/private/qthreadpooler_p.h> #include <Qt3DCore/private/qtickclock_p.h> -#include <Qt3DCore/private/qabstractframeadvanceservice_p.h> -#include <QEventLoop> -#include <QThread> -#include <QWaitCondition> -#include <QSurface> +#include <Qt3DCore/private/qtickclockservice_p.h> #if defined(QT3D_CORE_JOB_TIMING) #include <QElapsedTimer> |