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/texture/texturedatamanager.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/texture/texturedatamanager.cpp')
-rw-r--r-- | src/render/texture/texturedatamanager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/render/texture/texturedatamanager.cpp b/src/render/texture/texturedatamanager.cpp index 3e77179f6..313a2fe0a 100644 --- a/src/render/texture/texturedatamanager.cpp +++ b/src/render/texture/texturedatamanager.cpp @@ -48,7 +48,7 @@ TextureDataManager::TextureDataManager() {} // Called from AspectThread sync -void TextureDataManager::addToPendingTextures(const Qt3D::QNodeId &textureId) +void TextureDataManager::addToPendingTextures(const Qt3DCore::QNodeId &textureId) { // This simple check ensures that we won't be having n jobs // for one mesh, in case n Materials are referencing the said @@ -58,9 +58,9 @@ void TextureDataManager::addToPendingTextures(const Qt3D::QNodeId &textureId) } // Called from AspectThread prepare jobs -QVector<Qt3D::QNodeId> TextureDataManager::texturesPending() +QVector<Qt3DCore::QNodeId> TextureDataManager::texturesPending() { - QVector<Qt3D::QNodeId> textureIds = m_texturesPending; + QVector<Qt3DCore::QNodeId> textureIds = m_texturesPending; m_texturesPending.clear(); return textureIds; } |