Merge remote-tracking branch 'origin/5.12' into 5.13

 Conflicts:
	tests/auto/render/shaderbuilder/tst_shaderbuilder.cpp

Change-Id: I27de9b83fa6ef6bb319e4b11c932f91f9ff92dc3

2 files changed, 5 insertions, 2 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;
diff --git a/src/animation/frontend/qchannelmapping_p.h b/src/animation/frontend/qchannelmapping_p.h
index 6a3f1afc5..0ab66a7f7 100644
--- a/src/animation/frontend/qchannelmapping_p.h
+++ b/src/animation/frontend/qchannelmapping_p.h
@@ -77,7 +77,6 @@ struct QChannelMappingData
 {
     QString channelName;
     Qt3DCore::QNodeId targetId;
-    QString property;
     int type;
     int componentCount;
     const char *propertyName;