summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2014-08-18 11:42:47 +0100
committerSean Harmer <sean.harmer@kdab.com>2014-08-18 14:24:58 +0200
commit7ae3f3b737fa893da5d12d8ec5aff09e82f6dfb6 (patch)
treec25fef861832b6ba8dc09bff7b8c7cab1684c485 /src
parentc28bd8c614698b99553e5b329677e1067862766c (diff)
The gltf parser is now private
Change-Id: If6ff04047cb3befe532a0b83f09c8c6ca1c08a35 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src')
-rw-r--r--src/render/frontend/qabstractscene.cpp2
-rw-r--r--src/render/io/gltfparser.cpp2
-rw-r--r--src/render/io/gltfparser_p.h (renamed from src/render/io/gltfparser.h)0
-rw-r--r--src/render/io/render-io.pri2
4 files changed, 3 insertions, 3 deletions
diff --git a/src/render/frontend/qabstractscene.cpp b/src/render/frontend/qabstractscene.cpp
index 5bda20087..592b4b87d 100644
--- a/src/render/frontend/qabstractscene.cpp
+++ b/src/render/frontend/qabstractscene.cpp
@@ -43,7 +43,7 @@
#include "qabstractscene_p.h"
#include "renderlogging.h"
#include <Qt3DRenderer/private/abstractsceneparser_p.h>
-#include <gltfparser.h>
+#include <Qt3DRenderer/private/gltfparser_p.h>
#include <Qt3DRenderer/private/assimpparser_p.h>
QT_BEGIN_NAMESPACE
diff --git a/src/render/io/gltfparser.cpp b/src/render/io/gltfparser.cpp
index 60be17f1c..b2beae588 100644
--- a/src/render/io/gltfparser.cpp
+++ b/src/render/io/gltfparser.cpp
@@ -40,7 +40,7 @@
**
****************************************************************************/
-#include "gltfparser.h"
+#include "gltfparser_p.h"
#include "texturedata.h"
#include "renderlogging.h"
diff --git a/src/render/io/gltfparser.h b/src/render/io/gltfparser_p.h
index d0230d761..d0230d761 100644
--- a/src/render/io/gltfparser.h
+++ b/src/render/io/gltfparser_p.h
diff --git a/src/render/io/render-io.pri b/src/render/io/render-io.pri
index cbda7f417..63ac6470b 100644
--- a/src/render/io/render-io.pri
+++ b/src/render/io/render-io.pri
@@ -2,7 +2,7 @@ INCLUDEPATH += $$PWD
HEADERS += \
$$PWD/meshdata.h \
- $$PWD/gltfparser.h \
+ $$PWD/gltfparser_p.h \
$$PWD/objloader.h \
$$PWD/texturedata.h \
$$PWD/assimpparser_p.h \