diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2014-07-08 17:17:52 +0200 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2014-07-09 16:01:17 +0200 |
| commit | 54e8e8714fdadb5b98a33ca5026049818ea49c45 (patch) | |
| tree | 943a122f27fe3702710198203fc27c800c506508 /src/render/io/gltfparser.cpp | |
| parent | 527c58e8f06a44ba12868ebeecc3bc4286462bc8 (diff) | |
Renamed ShaderProgram to QShaderProgram
Change-Id: I7a9fd824f1975791ee7448023d089e06c34de69d
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/io/gltfparser.cpp')
| -rw-r--r-- | src/render/io/gltfparser.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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(), |