summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/sceneparsers/assimp/assimp.pro2
-rw-r--r--src/plugins/sceneparsers/assimp/assimpparser.cpp26
-rw-r--r--src/plugins/sceneparsers/assimp/assimpparser_p.h2
-rw-r--r--src/plugins/sceneparsers/gltf/gltf.pro2
-rw-r--r--src/plugins/sceneparsers/gltf/gltfparser.cpp42
-rw-r--r--src/plugins/sceneparsers/gltf/gltfparser_p.h6
6 files changed, 40 insertions, 40 deletions
diff --git a/src/plugins/sceneparsers/assimp/assimp.pro b/src/plugins/sceneparsers/assimp/assimp.pro
index fe834252b..a7607cb73 100644
--- a/src/plugins/sceneparsers/assimp/assimp.pro
+++ b/src/plugins/sceneparsers/assimp/assimp.pro
@@ -1,5 +1,5 @@
TARGET = assimpsceneparser
-QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private
+QT += core-private 3dcore 3dcore-private 3drender 3drender-private
PLUGIN_TYPE = sceneparsers
PLUGIN_CLASS_NAME = AssimpParser
diff --git a/src/plugins/sceneparsers/assimp/assimpparser.cpp b/src/plugins/sceneparsers/assimp/assimpparser.cpp
index 4036fd7d3..35437ff07 100644
--- a/src/plugins/sceneparsers/assimp/assimpparser.cpp
+++ b/src/plugins/sceneparsers/assimp/assimpparser.cpp
@@ -41,23 +41,23 @@
#include <Qt3DCore/qlookattransform.h>
#include <Qt3DCore/qmatrixtransform.h>
#include <Qt3DCore/qcameralens.h>
-#include <Qt3DRenderer/qparameter.h>
-#include <Qt3DRenderer/qeffect.h>
-#include <Qt3DRenderer/qmesh.h>
-#include <Qt3DRenderer/qmaterial.h>
-#include <Qt3DRenderer/qbuffer.h>
-#include <Qt3DRenderer/qattribute.h>
-#include <Qt3DRenderer/qtexture.h>
-#include <Qt3DRenderer/qdiffusemapmaterial.h>
-#include <Qt3DRenderer/qdiffusespecularmapmaterial.h>
-#include <Qt3DRenderer/qphongmaterial.h>
+#include <Qt3DRender/qparameter.h>
+#include <Qt3DRender/qeffect.h>
+#include <Qt3DRender/qmesh.h>
+#include <Qt3DRender/qmaterial.h>
+#include <Qt3DRender/qbuffer.h>
+#include <Qt3DRender/qattribute.h>
+#include <Qt3DRender/qtexture.h>
+#include <Qt3DRender/qdiffusemapmaterial.h>
+#include <Qt3DRender/qdiffusespecularmapmaterial.h>
+#include <Qt3DRender/qphongmaterial.h>
#include <QFileInfo>
#include <QColor>
#include <qmath.h>
-#include <Qt3DRenderer/private/renderlogging_p.h>
+#include <Qt3DRender/private/renderlogging_p.h>
#include <Qt3DCore/private/qurlhelper_p.h>
-#include <Qt3DRenderer/qgeometryrenderer.h>
-#include <Qt3DRenderer/qgeometry.h>
+#include <Qt3DRender/qgeometryrenderer.h>
+#include <Qt3DRender/qgeometry.h>
QT_BEGIN_NAMESPACE
diff --git a/src/plugins/sceneparsers/assimp/assimpparser_p.h b/src/plugins/sceneparsers/assimp/assimpparser_p.h
index 00304b262..33bcf1831 100644
--- a/src/plugins/sceneparsers/assimp/assimpparser_p.h
+++ b/src/plugins/sceneparsers/assimp/assimpparser_p.h
@@ -53,7 +53,7 @@
#include <assimp/scene.h>
#include <assimp/postprocess.h>
#include <assimp/DefaultLogger.hpp>
-#include <Qt3DRenderer/private/abstractsceneparser_p.h>
+#include <Qt3DRender/private/abstractsceneparser_p.h>
#include "assimphelpers_p.h"
#include <QMap>
diff --git a/src/plugins/sceneparsers/gltf/gltf.pro b/src/plugins/sceneparsers/gltf/gltf.pro
index bf289372d..100140f97 100644
--- a/src/plugins/sceneparsers/gltf/gltf.pro
+++ b/src/plugins/sceneparsers/gltf/gltf.pro
@@ -1,5 +1,5 @@
TARGET = gltfsceneparser
-QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private
+QT += core-private 3dcore 3dcore-private 3drender 3drender-private
PLUGIN_TYPE = sceneparsers
PLUGIN_CLASS_NAME = GLTFParser
diff --git a/src/plugins/sceneparsers/gltf/gltfparser.cpp b/src/plugins/sceneparsers/gltf/gltfparser.cpp
index 61f040ca4..7fbbd7933 100644
--- a/src/plugins/sceneparsers/gltf/gltfparser.cpp
+++ b/src/plugins/sceneparsers/gltf/gltfparser.cpp
@@ -51,27 +51,27 @@
#include <Qt3DCore/private/qurlhelper_p.h>
-#include <Qt3DRenderer/QAlphaCoverage>
-#include <Qt3DRenderer/QBlendEquation>
-#include <Qt3DRenderer/QBlendStateSeparate>
-#include <Qt3DRenderer/QColorMask>
-#include <Qt3DRenderer/QCullFace>
-#include <Qt3DRenderer/QDepthMask>
-#include <Qt3DRenderer/QDepthTest>
-#include <Qt3DRenderer/QEffect>
-#include <Qt3DRenderer/QFrontFace>
-#include <Qt3DRenderer/QGeometry>
-#include <Qt3DRenderer/QGeometryRenderer>
-#include <Qt3DRenderer/QMaterial>
-#include <Qt3DRenderer/QOpenGLFilter>
-#include <Qt3DRenderer/QParameter>
-#include <Qt3DRenderer/QParameterMapping>
-#include <Qt3DRenderer/QPolygonOffset>
-#include <Qt3DRenderer/QRenderState>
-#include <Qt3DRenderer/QScissorTest>
-#include <Qt3DRenderer/QShaderProgram>
-#include <Qt3DRenderer/QTechnique>
-#include <Qt3DRenderer/QTexture>
+#include <Qt3DRender/QAlphaCoverage>
+#include <Qt3DRender/QBlendEquation>
+#include <Qt3DRender/QBlendStateSeparate>
+#include <Qt3DRender/QColorMask>
+#include <Qt3DRender/QCullFace>
+#include <Qt3DRender/QDepthMask>
+#include <Qt3DRender/QDepthTest>
+#include <Qt3DRender/QEffect>
+#include <Qt3DRender/QFrontFace>
+#include <Qt3DRender/QGeometry>
+#include <Qt3DRender/QGeometryRenderer>
+#include <Qt3DRender/QMaterial>
+#include <Qt3DRender/QOpenGLFilter>
+#include <Qt3DRender/QParameter>
+#include <Qt3DRender/QParameterMapping>
+#include <Qt3DRender/QPolygonOffset>
+#include <Qt3DRender/QRenderState>
+#include <Qt3DRender/QScissorTest>
+#include <Qt3DRender/QShaderProgram>
+#include <Qt3DRender/QTechnique>
+#include <Qt3DRender/QTexture>
QT_BEGIN_NAMESPACE
diff --git a/src/plugins/sceneparsers/gltf/gltfparser_p.h b/src/plugins/sceneparsers/gltf/gltfparser_p.h
index 448fc900e..5ce69ebc5 100644
--- a/src/plugins/sceneparsers/gltf/gltfparser_p.h
+++ b/src/plugins/sceneparsers/gltf/gltfparser_p.h
@@ -52,10 +52,10 @@
#include <QtCore/QJsonDocument>
#include <QtCore/QMultiHash>
-#include <Qt3DRenderer/qattribute.h>
-#include <Qt3DRenderer/qbuffer.h>
+#include <Qt3DRender/qattribute.h>
+#include <Qt3DRender/qbuffer.h>
-#include <Qt3DRenderer/private/abstractsceneparser_p.h>
+#include <Qt3DRender/private/abstractsceneparser_p.h>
QT_BEGIN_NAMESPACE