summaryrefslogtreecommitdiffstats
path: root/src/render/io/gltfparser.cpp
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2014-10-20 08:44:50 +0200
committerPaul Lemire <paul.lemire@kdab.com>2014-10-22 10:45:16 +0200
commit5d31b5f774475f87a00447c4eac6eb96e9651675 (patch)
treee0206fbc355033b2d41a2ef423feb5c8fc488e8e /src/render/io/gltfparser.cpp
parent0c8a6df93997e7aba0c8269ce986bd8fe4168d5b (diff)
QAbstractMeshData merged with QMeshData and moved to Renderer
That implied moving QAbstractMesh to Renderer as well. Change-Id: I9013bf0458b849f7805d214a70580a80e86d8c84 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/io/gltfparser.cpp')
-rw-r--r--src/render/io/gltfparser.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/render/io/gltfparser.cpp b/src/render/io/gltfparser.cpp
index c78e844e7..f41a5ed23 100644
--- a/src/render/io/gltfparser.cpp
+++ b/src/render/io/gltfparser.cpp
@@ -74,7 +74,7 @@
// need to move these to somewhere common?
#include <Qt3DRenderer/private/renderstate_p.h>
#include <Qt3DRenderer/private/blendstate_p.h>
-#include <Qt3DCore/private/qabstractmesh_p.h>
+#include <private/qabstractmesh_p.h>
QT_BEGIN_NAMESPACE
@@ -215,7 +215,7 @@ private:
{
public:
explicit GLTFParserMeshFunctor(QMeshDataPtr meshData);
- QAbstractMeshDataPtr operator ()() Q_DECL_OVERRIDE;
+ QMeshDataPtr operator ()() Q_DECL_OVERRIDE;
bool operator ==(const QAbstractMeshFunctor &other) const Q_DECL_OVERRIDE;
private:
@@ -1041,7 +1041,7 @@ GLTFParserMesh::GLTFParserMeshFunctor::GLTFParserMeshFunctor(QMeshDataPtr meshDa
{
}
-QAbstractMeshDataPtr GLTFParserMesh::GLTFParserMeshFunctor::operator ()()
+QMeshDataPtr GLTFParserMesh::GLTFParserMeshFunctor::operator ()()
{
return m_meshData;
}