diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2015-10-12 20:45:19 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2015-10-13 13:19:50 +0000 |
| commit | 7c971e0e7791ab38d7d3d8ebc25468c44cbe49c5 (patch) | |
| tree | 53197a9e5eb7501d6f5b497f70c25dad9c265a6f /src/render/backend/quniformvalue.cpp | |
| parent | 0bfd20ad3b8eb3edec8d6317af9eb5504f8c0871 (diff) | |
Move Qt3DCore into Qt3DCore namespace
Update other aspects, tests and examples accordingly.
Change-Id: Ib1bcf0bdf4f5aec4422dc0c80bfc32b27fb1a317
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/backend/quniformvalue.cpp')
| -rw-r--r-- | src/render/backend/quniformvalue.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/render/backend/quniformvalue.cpp b/src/render/backend/quniformvalue.cpp index 140035d80..df25fb466 100644 --- a/src/render/backend/quniformvalue.cpp +++ b/src/render/backend/quniformvalue.cpp @@ -56,7 +56,7 @@ QUniformValue::QUniformValue() { } -QUniformValue *QUniformValue::fromVariant(const QVariant &v, Qt3D::QFrameAllocator *allocator) +QUniformValue *QUniformValue::fromVariant(const QVariant &v, Qt3DCore::QFrameAllocator *allocator) { QUniformValue *u = allocator->allocate<QUniformValue>(); u->m_var = v; @@ -88,7 +88,7 @@ void QUniformPack::setUniform(const QString &glslName, const QUniformValue *val) m_uniforms.insert(glslName, val); } -void QUniformPack::setTexture(const QString &glslName, const Qt3D::QNodeId &texId) +void QUniformPack::setTexture(const QString &glslName, const Qt3DCore::QNodeId &texId) { for (int t=0; t<m_textures.size(); ++t) { if (m_textures[t].glslName != glslName) { |