diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-03-05 16:24:00 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-03-07 08:02:45 +0000 |
| commit | 9c0dc42939b2a047709e80d40b18cecf01d4c881 (patch) | |
| tree | f9123388af326c25a2859d0a319c4575751b29c3 /tests | |
| parent | 698bd5f22c79ecf777a0abe57a36676dc49fa8f3 (diff) | |
Fix deprecation warnings about setDataType()/setDataSize()
Replace by new API, fixing:
tst_gltfplugins.cpp:590:67: warning: 'void Qt3DRender::QAttribute::setDataType(Qt3DRender::QAttribute::VertexBaseType)' is deprecated [-Wdeprecated-declarations]
tst_gltfplugins.cpp:591:39: warning: 'void Qt3DRender::QAttribute::setDataSize(uint)' is deprecated [-Wdeprecated-declarations]
tst_gltfplugins.cpp:623:60: warning: 'void Qt3DRender::QAttribute::setDataType(Qt3DRender::QAttribute::VertexBaseType)' is deprecated [-Wdeprecated-declarations]
tst_gltfplugins.cpp:624:32: warning: 'void Qt3DRender::QAttribute::setDataSize(uint)' is deprecated [-Wdeprecated-declarations]
tst_gltfplugins.cpp:639:70: warning: 'void Qt3DRender::QAttribute::setDataType(Qt3DRender::QAttribute::VertexBaseType)' is deprecated [-Wdeprecated-declarations]
tst_gltfplugins.cpp:640:34: warning: 'void Qt3DRender::QAttribute::setDataSize(uint)' is deprecated [-Wdeprecated-declarations]
tst_gltfplugins.cpp:654:62: warning: 'void Qt3DRender::QAttribute::setDataType(Qt3DRender::QAttribute::VertexBaseType)' is deprecated [-Wdeprecated-declarations]
tst_gltfplugins.cpp:655:34: warning: 'void Qt3DRender::QAttribute::setDataSize(uint)' is deprecated [-Wdeprecated-declarations]
Change-Id: Ie5e379db148edf1853d1a7a2661e328612b35bae
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/render/gltfplugins/tst_gltfplugins.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/render/gltfplugins/tst_gltfplugins.cpp b/tests/auto/render/gltfplugins/tst_gltfplugins.cpp index e5a0eef21..4cc4843dd 100644 --- a/tests/auto/render/gltfplugins/tst_gltfplugins.cpp +++ b/tests/auto/render/gltfplugins/tst_gltfplugins.cpp @@ -587,8 +587,8 @@ void tst_gltfPlugins::createTestScene() Qt3DRender::QAttribute *customAttribute = new Qt3DRender::QAttribute(); customAttribute->setAttributeType(Qt3DRender::QAttribute::VertexAttribute); customAttribute->setBuffer(offsetBuffer); - customAttribute->setDataType(Qt3DRender::QAttribute::Float); - customAttribute->setDataSize(3); + customAttribute->setVertexBaseType(Qt3DRender::QAttribute::Float); + customAttribute->setVertexSize(3); customAttribute->setByteOffset(0); customAttribute->setByteStride(0); customAttribute->setCount(8); @@ -620,8 +620,8 @@ void tst_gltfPlugins::addPositionAttributeToGeometry(Qt3DRender::QGeometry *geom Qt3DRender::QAttribute *posAttribute = new Qt3DRender::QAttribute(); posAttribute->setAttributeType(Qt3DRender::QAttribute::VertexAttribute); posAttribute->setBuffer(buffer); - posAttribute->setDataType(Qt3DRender::QAttribute::Float); - posAttribute->setDataSize(3); + posAttribute->setVertexBaseType(Qt3DRender::QAttribute::Float); + posAttribute->setVertexSize(3); posAttribute->setByteOffset(0); posAttribute->setByteStride(0); posAttribute->setCount(count); @@ -636,8 +636,8 @@ void tst_gltfPlugins::addIndexAttributeToGeometry(Qt3DRender::QGeometry *geometr Qt3DRender::QAttribute *indexAttribute = new Qt3DRender::QAttribute(); indexAttribute->setAttributeType(Qt3DRender::QAttribute::IndexAttribute); indexAttribute->setBuffer(buffer); - indexAttribute->setDataType(Qt3DRender::QAttribute::UnsignedShort); - indexAttribute->setDataSize(1); + indexAttribute->setVertexBaseType(Qt3DRender::QAttribute::UnsignedShort); + indexAttribute->setVertexSize(1); indexAttribute->setByteOffset(0); indexAttribute->setByteStride(0); indexAttribute->setCount(count); @@ -651,8 +651,8 @@ void tst_gltfPlugins::addColorAttributeToGeometry(Qt3DRender::QGeometry *geometr Qt3DRender::QAttribute *colorAttribute = new Qt3DRender::QAttribute(); colorAttribute->setAttributeType(Qt3DRender::QAttribute::VertexAttribute); colorAttribute->setBuffer(buffer); - colorAttribute->setDataType(Qt3DRender::QAttribute::Float); - colorAttribute->setDataSize(4); + colorAttribute->setVertexBaseType(Qt3DRender::QAttribute::Float); + colorAttribute->setVertexSize(4); colorAttribute->setByteOffset(0); colorAttribute->setByteStride(0); colorAttribute->setCount(count); |