diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2017-05-20 14:57:26 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2017-05-20 14:57:53 +0100 |
commit | cd9059a22604307f483764db134d51b15c540758 (patch) | |
tree | 9ceea8edf2b41e55f17a49552d9cf37fcdedc9b2 /src/render/geometry | |
parent | 1d024678ba16dd979a8c7023b35cdc76db357d37 (diff) | |
parent | 9bf4daddeb62ec6a40e2d90587a7327acbb3780f (diff) |
Merge branch '5.9.0' into 5.9
Change-Id: Icb23dcb19d312559f5f4a71bde3dc26bf4a19408
Diffstat (limited to 'src/render/geometry')
-rw-r--r-- | src/render/geometry/attribute.cpp | 2 | ||||
-rw-r--r-- | src/render/geometry/buffer.cpp | 2 | ||||
-rw-r--r-- | src/render/geometry/geometryrenderer.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/render/geometry/attribute.cpp b/src/render/geometry/attribute.cpp index 7e1ea79dd..6c8c0113a 100644 --- a/src/render/geometry/attribute.cpp +++ b/src/render/geometry/attribute.cpp @@ -108,7 +108,7 @@ void Attribute::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) QByteArray propertyName = propertyChange->propertyName(); if (propertyName == QByteArrayLiteral("name")) { - m_name = propertyChange->value().value<QString>(); + m_name = propertyChange->value().toString(); m_nameId = StringToInt::lookupId(m_name); m_attributeDirty = true; } else if (propertyName == QByteArrayLiteral("vertexBaseType")) { diff --git a/src/render/geometry/buffer.cpp b/src/render/geometry/buffer.cpp index 82dbbcc1b..55c86910f 100644 --- a/src/render/geometry/buffer.cpp +++ b/src/render/geometry/buffer.cpp @@ -151,7 +151,7 @@ void Buffer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) QPropertyUpdatedChangePtr propertyChange = qSharedPointerCast<QPropertyUpdatedChange>(e); QByteArray propertyName = propertyChange->propertyName(); if (propertyName == QByteArrayLiteral("data")) { - QByteArray newData = propertyChange->value().value<QByteArray>(); + QByteArray newData = propertyChange->value().toByteArray(); bool dirty = m_data != newData; m_bufferDirty |= dirty; m_data = newData; diff --git a/src/render/geometry/geometryrenderer.cpp b/src/render/geometry/geometryrenderer.cpp index 54fe61831..4f5432e1d 100644 --- a/src/render/geometry/geometryrenderer.cpp +++ b/src/render/geometry/geometryrenderer.cpp @@ -153,7 +153,7 @@ void GeometryRenderer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) m_verticesPerPatch = propertyChange->value().value<int>(); m_dirty = true; } else if (propertyName == QByteArrayLiteral("primitiveRestartEnabled")) { - m_primitiveRestartEnabled = propertyChange->value().value<bool>(); + m_primitiveRestartEnabled = propertyChange->value().toBool(); m_dirty = true; } else if (propertyName == QByteArrayLiteral("primitiveType")) { m_primitiveType = static_cast<QGeometryRenderer::PrimitiveType>(propertyChange->value().value<int>()); |