diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2017-04-02 10:48:27 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2017-04-02 11:15:29 +0100 |
commit | f7934f67f7ca833182ac288bdcb61e0141dfbd84 (patch) | |
tree | 09b410ecfc7c8f114e2f994796dc41edf636476a /src/core/aspects/qaspectengine.cpp | |
parent | 3e664bf438d4a3ab9a5f1633f2db171632b777b8 (diff) | |
parent | c64df4a307aff064433f57805561cb445c0e285f (diff) |
Merge branch '5.8' into 5.9
Conflicts:
src/core/jobs/qthreadpooler.cpp
src/core/nodes/qcomponent.cpp
src/core/qpostman.cpp
src/core/qscene_p.h
src/core/services/qservicelocator_p.h
src/input/frontend/qinputaspect.cpp
src/plugins/sceneparsers/assimp/assimpimporter.cpp
src/plugins/sceneparsers/assimp/assimpimporter.h
src/plugins/sceneparsers/gltf/gltfimporter.h
src/plugins/sceneparsers/gltf/gltfio.cpp
src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp
src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
src/quick3d/quick3dextras/qt3dquickwindow.cpp
Change-Id: I3566708c6f74a34959e7bb64b64e93647ca3f699
Diffstat (limited to 'src/core/aspects/qaspectengine.cpp')
-rw-r--r-- | src/core/aspects/qaspectengine.cpp | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/src/core/aspects/qaspectengine.cpp b/src/core/aspects/qaspectengine.cpp index 91961984f..deb6245fd 100644 --- a/src/core/aspects/qaspectengine.cpp +++ b/src/core/aspects/qaspectengine.cpp @@ -38,27 +38,26 @@ ****************************************************************************/ #include "qaspectengine.h" +#include "qaspectengine_p.h" + +#include <Qt3DCore/qabstractaspect.h> +#include <Qt3DCore/qcomponent.h> +#include <Qt3DCore/qentity.h> +#include <Qt3DCore/qnode.h> +#include <QtCore/QMetaObject> -#include "qabstractaspect.h" -#include "qaspectthread_p.h" -#include "qaspectmanager_p.h" -#include "qchangearbiter_p.h" -#include "qabstractaspect.h" -#include "qnode.h" #include <Qt3DCore/private/corelogging_p.h> -#include <QMetaObject> -#include <private/qpostman_p.h> -#include <private/qscene_p.h> -#include <private/qaspectengine_p.h> -#include <private/qnode_p.h> -#include <private/qnodevisitor_p.h> -#include <private/qscene_p.h> -#include "qentity.h" -#include "qcomponent.h" +#include <Qt3DCore/private/qaspectthread_p.h> +#include <Qt3DCore/private/qaspectmanager_p.h> +#include <Qt3DCore/private/aspectcommanddebugger_p.h> +#include <Qt3DCore/private/qchangearbiter_p.h> #include <Qt3DCore/private/qeventfilterservice_p.h> +#include <Qt3DCore/private/qnode_p.h> +#include <Qt3DCore/private/qnodevisitor_p.h> #include <Qt3DCore/private/qnodecreatedchangegenerator_p.h> +#include <Qt3DCore/private/qpostman_p.h> +#include <Qt3DCore/private/qscene_p.h> #include <Qt3DCore/private/qservicelocator_p.h> -#include <Qt3DCore/private/aspectcommanddebugger_p.h> QT_BEGIN_NAMESPACE |