diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2019-03-28 10:09:34 +0100 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2019-05-10 10:10:14 +0000 |
commit | 7a310b1f813e3f3c2759c7b316ed9af30f57d5cd (patch) | |
tree | 18e7d1b8bc95abd018ed75e3e6aef8248ff236d5 /src/animation/frontend/qchannelmapping.cpp | |
parent | f15623b689b43ad0799fe9515b8032418cf724d6 (diff) |
QChannelMapping: only send const char *propertyName to backend
It was otherwise sending a QString property as well as the
const char *propertyName. Given only propertyName is actually used,
remove QString property from the backend to avoid useless confusion
and stop sending the notification change.
Change-Id: Ie26771e320e26d44d7fce3e0a864bad1d4df558f
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'src/animation/frontend/qchannelmapping.cpp')
-rw-r--r-- | src/animation/frontend/qchannelmapping.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/animation/frontend/qchannelmapping.cpp b/src/animation/frontend/qchannelmapping.cpp index 0dbe68c8c..8f6ebe9ab 100644 --- a/src/animation/frontend/qchannelmapping.cpp +++ b/src/animation/frontend/qchannelmapping.cpp @@ -257,7 +257,12 @@ void QChannelMapping::setProperty(const QString &property) return; d->m_property = property; + + // The backend uses propertyName instead of property + const bool blocked = blockNotifications(true); emit propertyChanged(property); + blockNotifications(blocked); + d->updatePropertyNameTypeAndComponentCount(); } @@ -268,7 +273,6 @@ Qt3DCore::QNodeCreatedChangeBasePtr QChannelMapping::createNodeCreationChange() Q_D(const QChannelMapping); data.channelName = d->m_channelName; data.targetId = Qt3DCore::qIdForNode(d->m_target); - data.property = d->m_property; data.type = d->m_type; data.componentCount = d->m_componentCount; data.propertyName = d->m_propertyName; |