From 46d34c16d38e31a8e303f248ef679c3c09893bd7 Mon Sep 17 00:00:00 2001 From: Paul Lemire Date: Fri, 22 Apr 2016 08:54:59 +0200 Subject: QParameter: don't manually send property change Rely on the internal automatic mechanism. This fixes having to set a property name from a temporary QByteArray. Change-Id: I13dc7a87e3e9a665d2de77c7425a83627f931ace Task-number: QTBUG-50524 Reviewed-by: Sean Harmer --- src/render/materialsystem/qparameter.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/render/materialsystem/qparameter.cpp') diff --git a/src/render/materialsystem/qparameter.cpp b/src/render/materialsystem/qparameter.cpp index ba4eb5895..c4bea633b 100644 --- a/src/render/materialsystem/qparameter.cpp +++ b/src/render/materialsystem/qparameter.cpp @@ -120,19 +120,14 @@ void QParameter::setValue(const QVariant &dv) { Q_D(QParameter); if (d->m_value != dv) { - d->setValue(dv); - emit valueChanged(dv); // In case node values are declared inline QNode *nodeValue = dv.value(); if (nodeValue != Q_NULLPTR && !nodeValue->parent()) nodeValue->setParent(this); - QNodePropertyChangePtr change(new QNodePropertyChange(NodeUpdated, QSceneChange::Node, id())); - change->setPropertyName(d->m_name.toUtf8().data()); - change->setValue(d->m_backendValue); - - d->notifyObservers(change); + d->setValue(dv); + emit valueChanged(dv); } } -- cgit v1.2.3