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/logic/manager.cpp | |
| parent | 59f8fec8a41606b3185fe3a4e276978e3e1ed5ef (diff) | |
| parent | 939b9b4b7591e8a421cf048a0a84ed3e75d81d21 (diff) | |
Merge branch 'dev' into wip/animationwip/animation
Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f
Diffstat (limited to 'src/logic/manager.cpp')
| -rw-r--r-- | src/logic/manager.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/logic/manager.cpp b/src/logic/manager.cpp index 7f0a6b4eb..7b654ccd4 100644 --- a/src/logic/manager.cpp +++ b/src/logic/manager.cpp @@ -38,15 +38,16 @@ ****************************************************************************/ #include "manager_p.h" -#include "qlogicaspect.h" + +#include <Qt3DLogic/qlogicaspect.h> +#include <QtCore/QDebug> +#include <QtCore/QThread> +#include <QtCore/qcoreapplication.h> + #include <Qt3DCore/private/qabstractaspect_p.h> #include <Qt3DCore/private/qaspectmanager_p.h> #include <Qt3DLogic/private/executor_p.h> #include <Qt3DLogic/private/managers_p.h> -#include <QtCore/qcoreapplication.h> - -#include <QDebug> -#include <QThread> QT_BEGIN_NAMESPACE |