diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2016-05-09 13:46:14 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-10 19:08:37 +0000 |
| commit | a3e2dcf36679a5ae9cb18fe3730d0e3dca6240d6 (patch) | |
| tree | e613d11e42484142a1c044b08035924543864c8f /src/render/geometry | |
| parent | 9927e58063c7bfcb7fedf4f0e01a672dd6ff6b24 (diff) | |
Remove ChangeFlag from NodeUpdated change type ctors
...and fix resulting compilation issues and tests.
Had to temporarily allow QNode[Added|Removed] property change to be
able to handle QVariant payloads too. This will be split out into
a separate pair of classes in a future commit.
Task-number: QTBUG-51494
Change-Id: I1748e3b8aa3c39fa171ee0c5af4204502826ba07
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/geometry')
| -rw-r--r-- | src/render/geometry/qbuffer.cpp | 2 | ||||
| -rw-r--r-- | src/render/geometry/qgeometryrenderer.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/render/geometry/qbuffer.cpp b/src/render/geometry/qbuffer.cpp index 064e2dec6..6de2ee4e0 100644 --- a/src/render/geometry/qbuffer.cpp +++ b/src/render/geometry/qbuffer.cpp @@ -229,7 +229,7 @@ void QBuffer::setDataGenerator(const QBufferDataGeneratorPtr &functor) return; d->m_functor = functor; if (d->m_changeArbiter != nullptr) { - QNodePropertyChangePtr change(new QNodePropertyChange(PropertyUpdated, QSceneChange::Node, id())); + QNodePropertyChangePtr change(new QNodePropertyChange(QSceneChange::Node, id())); change->setPropertyName("dataGenerator"); change->setValue(QVariant::fromValue(d->m_functor)); d->notifyObservers(change); diff --git a/src/render/geometry/qgeometryrenderer.cpp b/src/render/geometry/qgeometryrenderer.cpp index aa055e856..e2a52f2ae 100644 --- a/src/render/geometry/qgeometryrenderer.cpp +++ b/src/render/geometry/qgeometryrenderer.cpp @@ -422,7 +422,7 @@ void QGeometryRenderer::setGeometryFactory(const QGeometryFactoryPtr &factory) return; d->m_geometryFactory = factory; if (d->m_changeArbiter != nullptr) { - QNodePropertyChangePtr change(new QNodePropertyChange(PropertyUpdated, QSceneChange::Node, id())); + QNodePropertyChangePtr change(new QNodePropertyChange(QSceneChange::Node, id())); change->setPropertyName("geometryFactory"); change->setValue(QVariant::fromValue(d->m_geometryFactory)); d->notifyObservers(change); |