diff options
| author | Robert Brock <robert.brock@kdab.com> | 2017-02-09 12:02:43 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-04-01 12:49:26 +0000 |
| commit | 71fd925db2bfa90b371c2f93d2d0b4da7200e11a (patch) | |
| tree | f81cbe4db604847f38144ff4e5969b068579ac63 /src/plugins/sceneparsers/assimp/assimpio.cpp | |
| parent | fd7561f6983fb0f8aa46fe32cc902ab3f8b24d0d (diff) | |
Fixes includes to comply with coding conventions for Src/scene
Task-number: QTBUG-56185
Change-Id: Ie52778260f5d2b82e79207bc8f7a77c9f9082935
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/plugins/sceneparsers/assimp/assimpio.cpp')
| -rw-r--r-- | src/plugins/sceneparsers/assimp/assimpio.cpp | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/src/plugins/sceneparsers/assimp/assimpio.cpp b/src/plugins/sceneparsers/assimp/assimpio.cpp index ba0fa00ca..c45f1ebdd 100644 --- a/src/plugins/sceneparsers/assimp/assimpio.cpp +++ b/src/plugins/sceneparsers/assimp/assimpio.cpp @@ -42,25 +42,27 @@ #include <Qt3DCore/private/qabstractnodefactory_p.h> #include <Qt3DCore/qentity.h> #include <Qt3DCore/qtransform.h> +#include <Qt3DExtras/qdiffusemapmaterial.h> +#include <Qt3DExtras/qdiffusespecularmapmaterial.h> +#include <Qt3DExtras/qphongmaterial.h> +#include <Qt3DRender/qattribute.h> +#include <Qt3DRender/qbuffer.h> #include <Qt3DRender/qcameralens.h> -#include <Qt3DRender/qparameter.h> #include <Qt3DRender/qeffect.h> -#include <Qt3DRender/qmesh.h> +#include <Qt3DRender/qgeometry.h> +#include <Qt3DRender/qgeometryrenderer.h> #include <Qt3DRender/qmaterial.h> -#include <Qt3DRender/qbuffer.h> -#include <Qt3DRender/qattribute.h> +#include <Qt3DRender/qmesh.h> +#include <Qt3DRender/qparameter.h> #include <Qt3DRender/qtexture.h> #include <Qt3DRender/qtextureimagedatagenerator.h> -#include <Qt3DExtras/qdiffusemapmaterial.h> -#include <Qt3DExtras/qdiffusespecularmapmaterial.h> -#include <Qt3DExtras/qphongmaterial.h> -#include <QFileInfo> -#include <QColor> +#include <QtCore/QFileInfo> +#include <QtGui/QColor> + #include <qmath.h> + #include <Qt3DRender/private/renderlogging_p.h> #include <Qt3DRender/private/qurlhelper_p.h> -#include <Qt3DRender/qgeometryrenderer.h> -#include <Qt3DRender/qgeometry.h> QT_BEGIN_NAMESPACE |