diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2015-02-25 15:38:42 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2015-02-28 16:28:54 +0000 |
commit | 66fc1e35db664ecaf0b37c855eea7391c0576773 (patch) | |
tree | cb805d9a294c40fb9a08cc985ee41366e962f20e /src/render/frontend/framegraph-components/qtechniquefilter.cpp | |
parent | 653ff3d4d5f992b64c4949e9741f4213a81a9f42 (diff) |
ChangeArbiter/SceneChange: use id as change subject
Instead of having a QNode* or QObservable as the subject of a change, we use
it's unique NodeId instead. That will prevent the ChangeArbiter from trying to
distribute changes by looking at a QNode/QObservable id when the
QNode/QObservable might have been destroyed in the meantime.
Change-Id: Ia419d5b841434fd65522c8c65de552089cfe97cf
Task-number: QTBUG-44628
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/frontend/framegraph-components/qtechniquefilter.cpp')
-rw-r--r-- | src/render/frontend/framegraph-components/qtechniquefilter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/render/frontend/framegraph-components/qtechniquefilter.cpp b/src/render/frontend/framegraph-components/qtechniquefilter.cpp index ee7507810..4fbbb0c75 100644 --- a/src/render/frontend/framegraph-components/qtechniquefilter.cpp +++ b/src/render/frontend/framegraph-components/qtechniquefilter.cpp @@ -88,7 +88,7 @@ void QTechniqueFilter::addRequirement(QAnnotation *criterion) criterion->setParent(this); if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr propertyChange(new QScenePropertyChange(NodeAdded, this)); + QScenePropertyChangePtr propertyChange(new QScenePropertyChange(NodeAdded, QSceneChange::Node, id())); propertyChange->setPropertyName("require"); propertyChange->setValue(QVariant::fromValue(criterion)); d->notifyObservers(propertyChange); @@ -99,7 +99,7 @@ void QTechniqueFilter::removeRequirement(QAnnotation *criterion) { Q_D(QTechniqueFilter); if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr propertyChange(new QScenePropertyChange(NodeRemoved, this)); + QScenePropertyChangePtr propertyChange(new QScenePropertyChange(NodeRemoved, QSceneChange::Node, id())); propertyChange->setPropertyName("require"); propertyChange->setValue(QVariant::fromValue(criterion->id())); d->notifyObservers(propertyChange); |