From 54e8e8714fdadb5b98a33ca5026049818ea49c45 Mon Sep 17 00:00:00 2001
From: Paul Lemire <paul.lemire@kdab.com>
Date: Tue, 8 Jul 2014 17:17:52 +0200
Subject: Renamed ShaderProgram to QShaderProgram

Change-Id: I7a9fd824f1975791ee7448023d089e06c34de69d
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
---
 src/render/io/gltfparser.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/render/io/gltfparser.cpp')

diff --git a/src/render/io/gltfparser.cpp b/src/render/io/gltfparser.cpp
index c8a0ca143..fa23b3ca2 100644
--- a/src/render/io/gltfparser.cpp
+++ b/src/render/io/gltfparser.cpp
@@ -48,7 +48,7 @@
 #include <qmesh.h>
 #include <qmaterial.h>
 #include <qtechnique.h>
-#include <shaderprogram.h>
+#include <qshaderprogram.h>
 #include <qeffect.h>
 #include <Qt3DCore/qcamera.h>
 #include <Qt3DCore/qtransform.h>
@@ -695,7 +695,7 @@ void GLTFParser::processName(const QJsonObject &json, QObject *ins)
 
 void GLTFParser::processJSONProgram( QString id, QJsonObject jsonObj)
 {
-    ShaderProgram* prog = new ShaderProgram;
+    QShaderProgram* prog = new QShaderProgram;
     prog->setObjectName(id);
 
     QString fragName = jsonObj.value(KEY_FRAGMENT_SHADER).toString(),
-- 
cgit v1.2.3