Remove deprecated classes and functions

Mostly old messaging API

Change-Id: I17eb2206b2ede56d2f7d36375d5e711d6149019f
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

47 files changed, 31 insertions, 828 deletions

diff --git a/src/animation/backend/animationutils_p.h b/src/animation/backend/animationutils_p.h
index 8c71e704a..81a964046 100644
--- a/src/animation/backend/animationutils_p.h
+++ b/src/animation/backend/animationutils_p.h
@@ -52,7 +52,6 @@
 #include <Qt3DAnimation/private/clock_p.h>
 #include <Qt3DAnimation/qanimationcallback.h>
 #include <Qt3DCore/qnodeid.h>
-#include <Qt3DCore/qscenechange.h>
 #include <Qt3DCore/private/sqt_p.h>
 
 #include <QtCore/qbitarray.h>
diff --git a/src/animation/backend/backendnode_p.h b/src/animation/backend/backendnode_p.h
index 4e450b6ec..b7bbff844 100644
--- a/src/animation/backend/backendnode_p.h
+++ b/src/animation/backend/backendnode_p.h
@@ -54,6 +54,7 @@
 #include <Qt3DAnimation/qt3danimation_global.h>
 #include <Qt3DCore/qbackendnode.h>
 #include <Qt3DAnimation/private/handler_p.h>
+#include <Qt3DCore/qnode.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/animation/backend/channelmapping.cpp b/src/animation/backend/channelmapping.cpp
index 1e3aa76f0..cfc6a16ef 100644
--- a/src/animation/backend/channelmapping.cpp
+++ b/src/animation/backend/channelmapping.cpp
@@ -42,7 +42,6 @@
 #include <Qt3DAnimation/private/qchannelmapping_p.h>
 #include <Qt3DAnimation/private/qskeletonmapping_p.h>
 #include <Qt3DAnimation/private/animationlogging_p.h>
-#include <Qt3DAnimation/private/qchannelmappingcreatedchange_p.h>
 #include <Qt3DAnimation/private/managers_p.h>
 #include <Qt3DCore/qabstractskeleton.h>
 
diff --git a/src/animation/backend/clipblendnode.cpp b/src/animation/backend/clipblendnode.cpp
index 57fbdb920..50e251398 100644
--- a/src/animation/backend/clipblendnode.cpp
+++ b/src/animation/backend/clipblendnode.cpp
@@ -35,7 +35,6 @@
 ****************************************************************************/
 
 #include "clipblendnode_p.h"
-#include <Qt3DAnimation/qclipblendnodecreatedchange.h>
 #include <Qt3DAnimation/qabstractanimationclip.h>
 
 QT_BEGIN_NAMESPACE
@@ -60,11 +59,6 @@ void ClipBlendNode::setClipBlendNodeManager(ClipBlendNodeManager *manager)
     m_manager = manager;
 }
 
-void ClipBlendNode::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change)
-{
-    Q_UNUSED(change);
-}
-
 ClipBlendNode::BlendType Animation::ClipBlendNode::blendType() const
 {
     return m_blendType;
diff --git a/src/animation/backend/clipblendnode_p.h b/src/animation/backend/clipblendnode_p.h
index 9651106f9..e650270cd 100644
--- a/src/animation/backend/clipblendnode_p.h
+++ b/src/animation/backend/clipblendnode_p.h
@@ -88,7 +88,6 @@ public:
 
 protected:
     explicit ClipBlendNode(BlendType blendType);
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) override;
     virtual ClipResults doBlend(const QVector<ClipResults> &blendData) const = 0;
 
 private:
@@ -110,14 +109,14 @@ public:
     {
     }
 
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const final
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNodeId id) const final
     {
-        if (m_manager->containsNode(change->subjectId()))
-            return static_cast<Backend *>(m_manager->lookupNode(change->subjectId()));
+        if (m_manager->containsNode(id))
+            return static_cast<Backend *>(m_manager->lookupNode(id));
         Backend *backend = new Backend();
         backend->setClipBlendNodeManager(m_manager);
         backend->setHandler(m_handler);
-        m_manager->appendNode(change->subjectId(), backend);
+        m_manager->appendNode(id, backend);
         return backend;
     }
 
diff --git a/src/animation/backend/clipblendvalue.cpp b/src/animation/backend/clipblendvalue.cpp
index 0db9544f6..dc63d4367 100644
--- a/src/animation/backend/clipblendvalue.cpp
+++ b/src/animation/backend/clipblendvalue.cpp
@@ -35,7 +35,6 @@
 ****************************************************************************/
 
 #include "clipblendvalue_p.h"
-#include <Qt3DAnimation/qclipblendnodecreatedchange.h>
 #include <Qt3DAnimation/qclipblendvalue.h>
 #include <Qt3DAnimation/private/qclipblendvalue_p.h>
 
diff --git a/src/animation/backend/nodefunctor_p.h b/src/animation/backend/nodefunctor_p.h
index 463205e52..47552b613 100644
--- a/src/animation/backend/nodefunctor_p.h
+++ b/src/animation/backend/nodefunctor_p.h
@@ -71,9 +71,9 @@ public:
     {
     }
 
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const final
+    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeId nodeId) const final
     {
-        Backend *backend = m_manager->getOrCreateResource(change->subjectId());
+        Backend *backend = m_manager->getOrCreateResource(nodeId);
         backend->setHandler(m_handler);
         return backend;
     }
diff --git a/src/animation/frontend/frontend.pri b/src/animation/frontend/frontend.pri
index baff81dd0..ccf433318 100644
--- a/src/animation/frontend/frontend.pri
+++ b/src/animation/frontend/frontend.pri
@@ -15,8 +15,6 @@ HEADERS += \
     $$PWD/qchannelmapper_p.h \
     $$PWD/qchannelmapping.h \
     $$PWD/qchannelmapping_p.h \
-    $$PWD/qclipblendnodecreatedchange.h \
-    $$PWD/qclipblendnodecreatedchange_p.h \
     $$PWD/qanimationcontroller.h \
     $$PWD/qanimationcontroller_p.h \
     $$PWD/qanimationgroup.h \
@@ -46,13 +44,10 @@ HEADERS += \
     $$PWD/qanimationclip.h \
     $$PWD/qanimationclip_p.h \
     $$PWD/qanimationcallback.h \
-    $$PWD/qanimationcallbacktrigger_p.h \
     $$PWD/qclock.h \
     $$PWD/qclock_p.h \
     $$PWD/qabstractchannelmapping.h \
     $$PWD/qabstractchannelmapping_p.h \
-    $$PWD/qchannelmappingcreatedchange_p.h \
-    $$PWD/qchannelmappingcreatedchange_p_p.h \
     $$PWD/qskeletonmapping.h \
     $$PWD/qskeletonmapping_p.h \
     $$PWD/qcallbackmapping.h \
@@ -67,7 +62,6 @@ SOURCES += \
     $$PWD/qblendedclipanimator.cpp \
     $$PWD/qchannelmapper.cpp \
     $$PWD/qchannelmapping.cpp \
-    $$PWD/qclipblendnodecreatedchange.cpp \
     $$PWD/qanimationcontroller.cpp \
     $$PWD/qanimationgroup.cpp \
     $$PWD/qkeyframeanimation.cpp \
@@ -84,10 +78,8 @@ SOURCES += \
     $$PWD/qchannelcomponent.cpp \
     $$PWD/qkeyframe.cpp \
     $$PWD/qanimationclip.cpp \
-    $$PWD/qanimationcallbacktrigger.cpp \
     $$PWD/qclock.cpp \
     $$PWD/qabstractchannelmapping.cpp \
-    $$PWD/qchannelmappingcreatedchange.cpp \
     $$PWD/qskeletonmapping.cpp \
     $$PWD/qcallbackmapping.cpp
 
diff --git a/src/animation/frontend/qabstractanimationclip.cpp b/src/animation/frontend/qabstractanimationclip.cpp
index 08133072c..1f1572a7e 100644
--- a/src/animation/frontend/qabstractanimationclip.cpp
+++ b/src/animation/frontend/qabstractanimationclip.cpp
@@ -133,11 +133,6 @@ QAbstractAnimationClip::QAbstractAnimationClip(QAbstractAnimationClipPrivate &dd
 {
 }
 
-// TODO Unused remove in Qt6
-void QAbstractAnimationClip::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &)
-{
-}
-
 /*!
     Destroys this animation clip.
 */
diff --git a/src/animation/frontend/qabstractanimationclip.h b/src/animation/frontend/qabstractanimationclip.h
index fddee3dec..f68950c4c 100644
--- a/src/animation/frontend/qabstractanimationclip.h
+++ b/src/animation/frontend/qabstractanimationclip.h
@@ -62,8 +62,7 @@ Q_SIGNALS:
 
 protected:
     QAbstractAnimationClip(QAbstractAnimationClipPrivate &dd, Qt3DCore::QNode *parent = nullptr);
-    // TODO Unused remove in Qt6
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override;
+
 private:
     Q_DECLARE_PRIVATE(QAbstractAnimationClip)
 };
diff --git a/src/animation/frontend/qabstractchannelmapping.cpp b/src/animation/frontend/qabstractchannelmapping.cpp
index 599ec6ed7..e1ea7f047 100644
--- a/src/animation/frontend/qabstractchannelmapping.cpp
+++ b/src/animation/frontend/qabstractchannelmapping.cpp
@@ -46,7 +46,7 @@ namespace Qt3DAnimation {
 
 QAbstractChannelMappingPrivate::QAbstractChannelMappingPrivate()
     : Qt3DCore::QNodePrivate()
-    , m_mappingType(QChannelMappingCreatedChangeBase::ChannelMapping)
+    , m_mappingType(ChannelMapping)
 {
 }
 
diff --git a/src/animation/frontend/qabstractchannelmapping_p.h b/src/animation/frontend/qabstractchannelmapping_p.h
index 2d77ee265..867e6be48 100644
--- a/src/animation/frontend/qabstractchannelmapping_p.h
+++ b/src/animation/frontend/qabstractchannelmapping_p.h
@@ -52,7 +52,6 @@
 //
 
 #include <Qt3DCore/private/qnode_p.h>
-#include <Qt3DAnimation/private/qchannelmappingcreatedchange_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -69,7 +68,13 @@ public:
 
     Q_DECLARE_PUBLIC(QAbstractChannelMapping)
 
-    QChannelMappingCreatedChangeBase::MappingType m_mappingType;
+    enum MappingType {
+        ChannelMapping = 0,
+        SkeletonMapping,
+        CallbackMapping
+    };
+
+    MappingType m_mappingType;
 };
 
 struct QAbstractChannelMappingData
diff --git a/src/animation/frontend/qabstractclipanimator.cpp b/src/animation/frontend/qabstractclipanimator.cpp
index 8c282da49..cb4621182 100644
--- a/src/animation/frontend/qabstractclipanimator.cpp
+++ b/src/animation/frontend/qabstractclipanimator.cpp
@@ -122,11 +122,6 @@ QAbstractClipAnimator::QAbstractClipAnimator(QAbstractClipAnimatorPrivate &dd, Q
 {
 }
 
-// TODO Unused remove in Qt6
-void QAbstractClipAnimator::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &)
-{
-}
-
 QAbstractClipAnimator::~QAbstractClipAnimator()
 {
 }
diff --git a/src/animation/frontend/qabstractclipanimator.h b/src/animation/frontend/qabstractclipanimator.h
index dc9dc9077..687589b5e 100644
--- a/src/animation/frontend/qabstractclipanimator.h
+++ b/src/animation/frontend/qabstractclipanimator.h
@@ -94,8 +94,6 @@ protected:
     explicit QAbstractClipAnimator(Qt3DCore::QNode *parent = nullptr);
     QAbstractClipAnimator(QAbstractClipAnimatorPrivate &dd, Qt3DCore::QNode *parent = nullptr);
 
-    // TODO Unused remove in Qt6
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override;
 private:
     Q_DECLARE_PRIVATE(QAbstractClipAnimator)
 };
diff --git a/src/animation/frontend/qadditiveclipblend.cpp b/src/animation/frontend/qadditiveclipblend.cpp
index dda3265c2..7ffb7facb 100644
--- a/src/animation/frontend/qadditiveclipblend.cpp
+++ b/src/animation/frontend/qadditiveclipblend.cpp
@@ -36,7 +36,6 @@
 
 #include "qadditiveclipblend.h"
 #include "qadditiveclipblend_p.h"
-#include <Qt3DAnimation/qclipblendnodecreatedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -135,17 +134,6 @@ QAdditiveClipBlend::~QAdditiveClipBlend()
 {
 }
 
-Qt3DCore::QNodeCreatedChangeBasePtr QAdditiveClipBlend::createNodeCreationChange() const
-{
-    Q_D(const QAdditiveClipBlend);
-    auto creationChange = QClipBlendNodeCreatedChangePtr<QAdditiveClipBlendData>::create(this);
-    QAdditiveClipBlendData &data = creationChange->data;
-    data.baseClipId = Qt3DCore::qIdForNode(d->m_baseClip);
-    data.additiveClipId = Qt3DCore::qIdForNode(d->m_additiveClip);
-    data.additiveFactor = d->m_additiveFactor;
-    return creationChange;
-}
-
 /*!
     \qmlproperty real AdditiveClipBlend::additiveFactor
 
diff --git a/src/animation/frontend/qadditiveclipblend.h b/src/animation/frontend/qadditiveclipblend.h
index 70c5b3cea..a675be23d 100644
--- a/src/animation/frontend/qadditiveclipblend.h
+++ b/src/animation/frontend/qadditiveclipblend.h
@@ -74,7 +74,6 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QAdditiveClipBlend)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // Qt3DAnimation
diff --git a/src/animation/frontend/qanimationaspect.cpp b/src/animation/frontend/qanimationaspect.cpp
index 744346e1f..b44ceaef4 100644
--- a/src/animation/frontend/qanimationaspect.cpp
+++ b/src/animation/frontend/qanimationaspect.cpp
@@ -104,34 +104,34 @@ QAnimationAspect::QAnimationAspect(QAnimationAspectPrivate &dd, QObject *parent)
     qRegisterMetaType<QVector<Qt3DCore::Sqt>>();
     qRegisterMetaType<Qt3DAnimation::QAbstractAnimationClip*>();
 
-    registerBackendType<QAbstractAnimationClip, true>(
+    registerBackendType<QAbstractAnimationClip>(
         QSharedPointer<Animation::NodeFunctor<Animation::AnimationClip, Animation::AnimationClipLoaderManager>>::create(d->m_handler.data(),
                                                                                                                         d->m_handler->animationClipLoaderManager()));
-    registerBackendType<QClock, true>(
+    registerBackendType<QClock>(
         QSharedPointer<Animation::NodeFunctor<Animation::Clock, Animation::ClockManager>>::create(d->m_handler.data(),
                                                                                                   d->m_handler->clockManager()));
-    registerBackendType<QClipAnimator, true>(
+    registerBackendType<QClipAnimator>(
         QSharedPointer<Animation::NodeFunctor<Animation::ClipAnimator, Animation::ClipAnimatorManager>>::create(d->m_handler.data(),
                                                                                                                 d->m_handler->clipAnimatorManager()));
-    registerBackendType<QBlendedClipAnimator, true>(
+    registerBackendType<QBlendedClipAnimator>(
         QSharedPointer<Animation::NodeFunctor<Animation::BlendedClipAnimator, Animation::BlendedClipAnimatorManager>>::create(d->m_handler.data(),
                                                                                                                               d->m_handler->blendedClipAnimatorManager()));
-    registerBackendType<QAbstractChannelMapping, true>(
+    registerBackendType<QAbstractChannelMapping>(
         QSharedPointer<Animation::NodeFunctor<Animation::ChannelMapping, Animation::ChannelMappingManager>>::create(d->m_handler.data(),
                                                                                                                     d->m_handler->channelMappingManager()));
-    registerBackendType<QChannelMapper, true>(
+    registerBackendType<QChannelMapper>(
         QSharedPointer<Animation::NodeFunctor<Animation::ChannelMapper, Animation::ChannelMapperManager>>::create(d->m_handler.data(),
                                                                                                                   d->m_handler->channelMapperManager()));
-    registerBackendType<QLerpClipBlend, true>(
+    registerBackendType<QLerpClipBlend>(
                 QSharedPointer<Animation::ClipBlendNodeFunctor<Animation::LerpClipBlend, Animation::ClipAnimatorManager>>::create(d->m_handler.data(),
                                                                                                                                   d->m_handler->clipBlendNodeManager()));
-    registerBackendType<QAdditiveClipBlend, true>(
+    registerBackendType<QAdditiveClipBlend>(
                 QSharedPointer<Animation::ClipBlendNodeFunctor<Animation::AdditiveClipBlend, Animation::ClipAnimatorManager>>::create(d->m_handler.data(),
                                                                                                                                       d->m_handler->clipBlendNodeManager()));
-    registerBackendType<QClipBlendValue, true>(
+    registerBackendType<QClipBlendValue>(
                 QSharedPointer<Animation::ClipBlendNodeFunctor<Animation::ClipBlendValue, Animation::ClipAnimatorManager>>::create(d->m_handler.data(),
                                                                                                                                    d->m_handler->clipBlendNodeManager()));
-    registerBackendType<Qt3DCore::QAbstractSkeleton, true>(
+    registerBackendType<Qt3DCore::QAbstractSkeleton>(
         QSharedPointer<Animation::NodeFunctor<Animation::Skeleton, Animation::SkeletonManager>>::create(d->m_handler.data(),
                                                                                                         d->m_handler->skeletonManager()));
 }
diff --git a/src/animation/frontend/qanimationcallbacktrigger.cpp b/src/animation/frontend/qanimationcallbacktrigger.cpp
deleted file mode 100644
index 83fccb5a4..000000000
--- a/src/animation/frontend/qanimationcallbacktrigger.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qanimationcallbacktrigger_p.h"
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DAnimation {
-
-QAnimationCallbackTrigger::QAnimationCallbackTrigger(Qt3DCore::QNodeId subjectId)
-    : Qt3DCore::QSceneChange(Qt3DCore::CallbackTriggered, subjectId),
-      m_callback(nullptr)
-{
-}
-
-} // namespace Qt3DAnimation
-
-QT_END_NAMESPACE
diff --git a/src/animation/frontend/qanimationcallbacktrigger_p.h b/src/animation/frontend/qanimationcallbacktrigger_p.h
deleted file mode 100644
index 9a05d421f..000000000
--- a/src/animation/frontend/qanimationcallbacktrigger_p.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QT3DANIMATION_QANIMATIONCALLBACKTRIGGER_P_H
-#define QT3DANIMATION_QANIMATIONCALLBACKTRIGGER_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists for the convenience
-// of other Qt classes.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <Qt3DAnimation/qt3danimation_global.h>
-#include <Qt3DAnimation/qanimationcallback.h>
-#include <Qt3DCore/qscenechange.h>
-#include <QtCore/qsharedpointer.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DAnimation {
-
-class Q_AUTOTEST_EXPORT QAnimationCallbackTrigger : public Qt3DCore::QSceneChange
-{
-public:
-    QAnimationCallbackTrigger(Qt3DCore::QNodeId subjectId);
-
-    void setCallback(QAnimationCallback *callback) { m_callback = callback; }
-    QAnimationCallback *callback() const { return m_callback; }
-
-    void setValue(const QVariant &value) { m_value = value; }
-    QVariant value() const { return m_value; }
-
-private:
-    QAnimationCallback *m_callback;
-    QVariant m_value;
-};
-
-typedef QSharedPointer<QAnimationCallbackTrigger> QAnimationCallbackTriggerPtr;
-
-} // namespace Qt3DAnimation
-
-QT_END_NAMESPACE
-
-#endif // QT3DANIMATION_QANIMATIONCALLBACKTRIGGER_P_H
diff --git a/src/animation/frontend/qanimationclip.cpp b/src/animation/frontend/qanimationclip.cpp
index 74a9b8371..8dfbf2a1f 100644
--- a/src/animation/frontend/qanimationclip.cpp
+++ b/src/animation/frontend/qanimationclip.cpp
@@ -92,15 +92,6 @@ void QAnimationClip::setClipData(const Qt3DAnimation::QAnimationClipData &clipDa
     emit clipDataChanged(clipData);
 }
 
-Qt3DCore::QNodeCreatedChangeBasePtr QAnimationClip::createNodeCreationChange() const
-{
-    auto creationChange = Qt3DCore::QNodeCreatedChangePtr<QAnimationClipChangeData>::create(this);
-    auto &data = creationChange->data;
-    Q_D(const QAnimationClip);
-    data.clipData = d->m_clipData;
-    return creationChange;
-}
-
 } // namespace Qt3DAnimation
 
 QT_END_NAMESPACE
diff --git a/src/animation/frontend/qanimationclip.h b/src/animation/frontend/qanimationclip.h
index cec758704..c93e162a4 100644
--- a/src/animation/frontend/qanimationclip.h
+++ b/src/animation/frontend/qanimationclip.h
@@ -72,7 +72,6 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QAnimationClip)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DAnimation
diff --git a/src/animation/frontend/qanimationcliploader.cpp b/src/animation/frontend/qanimationcliploader.cpp
index bf901e54f..41cf3f8a6 100644
--- a/src/animation/frontend/qanimationcliploader.cpp
+++ b/src/animation/frontend/qanimationcliploader.cpp
@@ -112,11 +112,6 @@ QAnimationClipLoader::QAnimationClipLoader(QAnimationClipLoaderPrivate &dd, Qt3D
 {
 }
 
-// TODO Unused remove in Qt6
-void QAnimationClipLoader::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &)
-{
-}
-
 QAnimationClipLoader::~QAnimationClipLoader()
 {
 }
@@ -146,15 +141,6 @@ void QAnimationClipLoader::setSource(const QUrl &source)
     emit sourceChanged(source);
 }
 
-Qt3DCore::QNodeCreatedChangeBasePtr QAnimationClipLoader::createNodeCreationChange() const
-{
-    auto creationChange = Qt3DCore::QNodeCreatedChangePtr<QAnimationClipLoaderData>::create(this);
-    auto &data = creationChange->data;
-    Q_D(const QAnimationClipLoader);
-    data.source = d->m_source;
-    return creationChange;
-}
-
 } // namespace Qt3DAnimation
 
 QT_END_NAMESPACE
diff --git a/src/animation/frontend/qanimationcliploader.h b/src/animation/frontend/qanimationcliploader.h
index 1b68e852f..55a46af8c 100644
--- a/src/animation/frontend/qanimationcliploader.h
+++ b/src/animation/frontend/qanimationcliploader.h
@@ -78,12 +78,9 @@ Q_SIGNALS:
 
 protected:
     explicit QAnimationClipLoader(QAnimationClipLoaderPrivate &dd, Qt3DCore::QNode *parent = nullptr);
-    // TODO Unused remove in Qt6
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override;
 
 private:
     Q_DECLARE_PRIVATE(QAnimationClipLoader)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DAnimation
diff --git a/src/animation/frontend/qblendedclipanimator.cpp b/src/animation/frontend/qblendedclipanimator.cpp
index c48706606..e6c5caead 100644
--- a/src/animation/frontend/qblendedclipanimator.cpp
+++ b/src/animation/frontend/qblendedclipanimator.cpp
@@ -306,21 +306,6 @@ void QBlendedClipAnimator::setBlendTree(QAbstractClipBlendNode *blendTree)
     emit blendTreeChanged(blendTree);
 }
 
-/*! \internal */
-Qt3DCore::QNodeCreatedChangeBasePtr QBlendedClipAnimator::createNodeCreationChange() const
-{
-    auto creationChange = Qt3DCore::QNodeCreatedChangePtr<QBlendedClipAnimatorData>::create(this);
-    QBlendedClipAnimatorData &data = creationChange->data;
-    Q_D(const QBlendedClipAnimator);
-    data.blendTreeRootId = Qt3DCore::qIdForNode(d->m_blendTreeRoot);
-    data.mapperId = Qt3DCore::qIdForNode(d->m_mapper);
-    data.clockId = Qt3DCore::qIdForNode(d->m_clock);
-    data.running = d->m_running;
-    data.loops = d->m_loops;
-    data.normalizedTime = d->m_normalizedTime;
-    return creationChange;
-}
-
 } // namespace Qt3DAnimation
 
 QT_END_NAMESPACE
diff --git a/src/animation/frontend/qblendedclipanimator.h b/src/animation/frontend/qblendedclipanimator.h
index f4463802f..2fb7595aa 100644
--- a/src/animation/frontend/qblendedclipanimator.h
+++ b/src/animation/frontend/qblendedclipanimator.h
@@ -72,7 +72,6 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QBlendedClipAnimator)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DAnimation
diff --git a/src/animation/frontend/qcallbackmapping.cpp b/src/animation/frontend/qcallbackmapping.cpp
index a86785012..dcc352b17 100644
--- a/src/animation/frontend/qcallbackmapping.cpp
+++ b/src/animation/frontend/qcallbackmapping.cpp
@@ -37,8 +37,6 @@
 #include "qcallbackmapping.h"
 #include "qcallbackmapping_p.h"
 
-#include <Qt3DAnimation/private/qchannelmappingcreatedchange_p.h>
-
 #include <QtCore/qmetaobject.h>
 #include <QtCore/QMetaProperty>
 
@@ -52,7 +50,7 @@ QCallbackMappingPrivate::QCallbackMappingPrivate()
     , m_type(static_cast<int>(QVariant::Invalid))
     , m_callback(nullptr)
 {
-    m_mappingType = QChannelMappingCreatedChangeBase::CallbackMapping;
+    m_mappingType = QAbstractChannelMappingPrivate::CallbackMapping;
 }
 
 /*!
@@ -140,18 +138,6 @@ void QCallbackMapping::setCallback(int type, QAnimationCallback *callback, QAnim
     }
 }
 
-Qt3DCore::QNodeCreatedChangeBasePtr QCallbackMapping::createNodeCreationChange() const
-{
-    auto creationChange = QChannelMappingCreatedChangePtr<QCallbackMappingData>::create(this);
-    auto &data = creationChange->data;
-    Q_D(const QCallbackMapping);
-    data.channelName = d->m_channelName;
-    data.type = d->m_type;
-    data.callback = d->m_callback;
-    data.callbackFlags = d->m_callbackFlags;
-    return creationChange;
-}
-
 } // namespace Qt3DAnimation
 
 QT_END_NAMESPACE
diff --git a/src/animation/frontend/qcallbackmapping.h b/src/animation/frontend/qcallbackmapping.h
index b98a3b430..056a19ac0 100644
--- a/src/animation/frontend/qcallbackmapping.h
+++ b/src/animation/frontend/qcallbackmapping.h
@@ -72,7 +72,6 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QCallbackMapping)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
 };
 
 } // namespace Qt3DAnimation
diff --git a/src/animation/frontend/qchannelmapper.cpp b/src/animation/frontend/qchannelmapper.cpp
index c5909adbc..2d0e0dd2d 100644
--- a/src/animation/frontend/qchannelmapper.cpp
+++ b/src/animation/frontend/qchannelmapper.cpp
@@ -36,7 +36,6 @@
 
 #include "qchannelmapper.h"
 #include "qchannelmapper_p.h"
-#include <Qt3DCore/qscenechange.h>
 #include <Qt3DAnimation/qchannelmapping.h>
 
 QT_BEGIN_NAMESPACE
@@ -86,7 +85,7 @@ void QChannelMapper::addMapping(QAbstractChannelMapping *mapping)
         if (!mapping->parent())
             mapping->setParent(this);
 
-        d->updateNode(mapping, "mappings", Qt3DCore::PropertyValueAdded);
+        d->update();
     }
 }
 
@@ -95,7 +94,7 @@ void QChannelMapper::removeMapping(QAbstractChannelMapping *mapping)
     Q_ASSERT(mapping);
     Q_D(QChannelMapper);
     d->m_mappings.removeOne(mapping);
-    d->updateNode(mapping, "mappings", Qt3DCore::PropertyValueRemoved);
+    d->update();
     // Remove bookkeeping connection
     d->unregisterDestructionHelper(mapping);
 }
@@ -106,15 +105,6 @@ QVector<QAbstractChannelMapping *> QChannelMapper::mappings() const
     return d->m_mappings;
 }
 
-Qt3DCore::QNodeCreatedChangeBasePtr QChannelMapper::createNodeCreationChange() const
-{
-    auto creationChange = Qt3DCore::QNodeCreatedChangePtr<QChannelMapperData>::create(this);
-    auto &data = creationChange->data;
-    Q_D(const QChannelMapper);
-    data.mappingIds = Qt3DCore::qIdsForNodes(d->m_mappings);
-    return creationChange;
-}
-
 } // namespace Qt3DAnimation
 
 QT_END_NAMESPACE
diff --git a/src/animation/frontend/qchannelmapper.h b/src/animation/frontend/qchannelmapper.h
index cb5532265..109bf7e06 100644
--- a/src/animation/frontend/qchannelmapper.h
+++ b/src/animation/frontend/qchannelmapper.h
@@ -64,7 +64,6 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QChannelMapper)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DAnimation
diff --git a/src/animation/frontend/qchannelmapping.cpp b/src/animation/frontend/qchannelmapping.cpp
index 16651afe6..bbccb0f16 100644
--- a/src/animation/frontend/qchannelmapping.cpp
+++ b/src/animation/frontend/qchannelmapping.cpp
@@ -37,8 +37,6 @@
 #include "qchannelmapping.h"
 #include "qchannelmapping_p.h"
 
-#include <Qt3DAnimation/private/qchannelmappingcreatedchange_p.h>
-
 #include <QtCore/qmetaobject.h>
 #include <QtCore/QMetaProperty>
 
@@ -110,7 +108,7 @@ QChannelMappingPrivate::QChannelMappingPrivate()
     , m_type(static_cast<int>(QVariant::Invalid))
     , m_componentCount(0)
 {
-    m_mappingType = QChannelMappingCreatedChangeBase::ChannelMapping;
+    m_mappingType = ChannelMapping;
 }
 
 /*!
@@ -248,19 +246,6 @@ void QChannelMapping::setProperty(const QString &property)
     d->updatePropertyNameTypeAndComponentCount();
 }
 
-Qt3DCore::QNodeCreatedChangeBasePtr QChannelMapping::createNodeCreationChange() const
-{
-    auto creationChange = QChannelMappingCreatedChangePtr<QChannelMappingData>::create(this);
-    auto &data = creationChange->data;
-    Q_D(const QChannelMapping);
-    data.channelName = d->m_channelName;
-    data.targetId = Qt3DCore::qIdForNode(d->m_target);
-    data.type = d->m_type;
-    data.componentCount = d->m_componentCount;
-    data.propertyName = d->m_propertyName;
-    return creationChange;
-}
-
 } // namespace Qt3DAnimation
 
 QT_END_NAMESPACE
diff --git a/src/animation/frontend/qchannelmapping.h b/src/animation/frontend/qchannelmapping.h
index e88e6daa9..ba2277a6c 100644
--- a/src/animation/frontend/qchannelmapping.h
+++ b/src/animation/frontend/qchannelmapping.h
@@ -77,7 +77,6 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QChannelMapping)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DAnimation
diff --git a/src/animation/frontend/qchannelmappingcreatedchange.cpp b/src/animation/frontend/qchannelmappingcreatedchange.cpp
deleted file mode 100644
index 6812278ac..000000000
--- a/src/animation/frontend/qchannelmappingcreatedchange.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qchannelmappingcreatedchange_p.h"
-#include "qchannelmappingcreatedchange_p_p.h"
-#include <Qt3DAnimation/private/qabstractchannelmapping_p.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DAnimation {
-
-QChannelMappingCreatedChangeBasePrivate::QChannelMappingCreatedChangeBasePrivate(const QAbstractChannelMapping *mapping)
-    : Qt3DCore::QNodeCreatedChangeBasePrivate(mapping)
-    , m_mappingType(QAbstractChannelMappingPrivate::get(mapping)->m_mappingType)
-{
-}
-
-/*!
-    \class Qt3DAnimation::QChannelMappingCreatedChangeBase
-    \inmodule Qt3DCore
-    \brief Base class for handling creation changes for QAbstractSkeleton sub-classes.
-*/
-QChannelMappingCreatedChangeBase::QChannelMappingCreatedChangeBase(const QAbstractChannelMapping *mapping)
-    : Qt3DCore::QNodeCreatedChangeBase(*new QChannelMappingCreatedChangeBasePrivate(mapping), mapping)
-{
-}
-
-/*! \internal */
-QChannelMappingCreatedChangeBase::~QChannelMappingCreatedChangeBase()
-{
-}
-
-/*! \internal */
-QChannelMappingCreatedChangeBase::MappingType QChannelMappingCreatedChangeBase::type() const
-{
-    Q_D(const QChannelMappingCreatedChangeBase);
-    return d->m_mappingType;
-}
-
-} // namespace Qt3DAnimation
-
-QT_END_NAMESPACE
diff --git a/src/animation/frontend/qchannelmappingcreatedchange_p.h b/src/animation/frontend/qchannelmappingcreatedchange_p.h
deleted file mode 100644
index 527ab524a..000000000
--- a/src/animation/frontend/qchannelmappingcreatedchange_p.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QT3DANIMATION_QCHANNELMAPPINGCREATEDCHANGE_P_H
-#define QT3DANIMATION_QCHANNELMAPPINGCREATEDCHANGE_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists for the convenience
-// of other Qt classes.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <Qt3DCore/qnodecreatedchange.h>
-#include <Qt3DAnimation/qabstractchannelmapping.h>
-#include <Qt3DAnimation/private/qt3danimation_global_p.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DAnimation {
-
-class QChannelMappingCreatedChangeBasePrivate;
-
-class Q_3DANIMATIONSHARED_PRIVATE_EXPORT QChannelMappingCreatedChangeBase : public Qt3DCore::QNodeCreatedChangeBase
-{
-public:
-    explicit QChannelMappingCreatedChangeBase(const QAbstractChannelMapping *mapping);
-    ~QChannelMappingCreatedChangeBase();
-
-    enum MappingType {
-        ChannelMapping = 0,
-        SkeletonMapping,
-        CallbackMapping
-    };
-
-    MappingType type() const;
-
-private:
-    Q_DECLARE_PRIVATE(QChannelMappingCreatedChangeBase)
-};
-
-typedef QSharedPointer<QChannelMappingCreatedChangeBase> QChannelMappingCreatedChangeBasePtr;
-
-template<typename T>
-class QChannelMappingCreatedChange : public QChannelMappingCreatedChangeBase
-{
-public:
-    explicit QChannelMappingCreatedChange(const QAbstractChannelMapping *_mapping)
-        : QChannelMappingCreatedChangeBase(_mapping)
-        , data()
-    {
-    }
-
-    T data;
-};
-
-template<typename T>
-using QChannelMappingCreatedChangePtr = QSharedPointer<QChannelMappingCreatedChange<T>>;
-
-} // namespace Qt3DAnimation
-
-QT_END_NAMESPACE
-
-#endif // QT3DANIMATION_QCHANNELMAPPINGCREATEDCHANGE_P_H
diff --git a/src/animation/frontend/qchannelmappingcreatedchange_p_p.h b/src/animation/frontend/qchannelmappingcreatedchange_p_p.h
deleted file mode 100644
index 8a89104a8..000000000
--- a/src/animation/frontend/qchannelmappingcreatedchange_p_p.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QT3DANIMATION_QCHANNELMAPPINGCREATEDCHANGE_P_P_H
-#define QT3DANIMATION_QCHANNELMAPPINGCREATEDCHANGE_P_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists for the convenience
-// of other Qt classes.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <Qt3DCore/private/qnodecreatedchange_p.h>
-#include <Qt3DAnimation/private/qchannelmappingcreatedchange_p.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DAnimation {
-
-class QAbstractChannelMapping;
-
-class QChannelMappingCreatedChangeBasePrivate : public Qt3DCore::QNodeCreatedChangeBasePrivate
-{
-public:
-    QChannelMappingCreatedChangeBasePrivate(const QAbstractChannelMapping *mapping);
-
-    QChannelMappingCreatedChangeBase::MappingType m_mappingType;
-};
-
-} // namespace Qt3DAnimation
-
-QT_END_NAMESPACE
-
-#endif // QT3DANIMATION_QCHANNELMAPPINGCREATEDCHANGE_P_P_H
diff --git a/src/animation/frontend/qclipanimator.cpp b/src/animation/frontend/qclipanimator.cpp
index ffad588c1..1f1d05a1b 100644
--- a/src/animation/frontend/qclipanimator.cpp
+++ b/src/animation/frontend/qclipanimator.cpp
@@ -163,21 +163,6 @@ void QClipAnimator::setClip(QAbstractAnimationClip *clip)
     emit clipChanged(clip);
 }
 
-/*! \internal */
-Qt3DCore::QNodeCreatedChangeBasePtr QClipAnimator::createNodeCreationChange() const
-{
-    auto creationChange = Qt3DCore::QNodeCreatedChangePtr<QClipAnimatorData>::create(this);
-    auto &data = creationChange->data;
-    Q_D(const QClipAnimator);
-    data.clipId = Qt3DCore::qIdForNode(d->m_clip);
-    data.mapperId = Qt3DCore::qIdForNode(d->m_mapper);
-    data.clockId = Qt3DCore::qIdForNode(d->m_clock);
-    data.running = d->m_running;
-    data.loops = d->m_loops;
-    data.normalizedTime = d->m_normalizedTime;
-    return creationChange;
-}
-
 } // namespace Qt3DAnimation
 
 QT_END_NAMESPACE
diff --git a/src/animation/frontend/qclipanimator.h b/src/animation/frontend/qclipanimator.h
index bc77b20ff..6025a5343 100644
--- a/src/animation/frontend/qclipanimator.h
+++ b/src/animation/frontend/qclipanimator.h
@@ -73,7 +73,6 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QClipAnimator)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DAnimation
diff --git a/src/animation/frontend/qclipblendnodecreatedchange.cpp b/src/animation/frontend/qclipblendnodecreatedchange.cpp
deleted file mode 100644
index 46079ad59..000000000
--- a/src/animation/frontend/qclipblendnodecreatedchange.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qclipblendnodecreatedchange.h"
-#include "qclipblendnodecreatedchange_p.h"
-#include <Qt3DAnimation/qabstractclipblendnode.h>
-#include <Qt3DAnimation/qabstractanimationclip.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DAnimation {
-
-QClipBlendNodeCreatedChangeBasePrivate::QClipBlendNodeCreatedChangeBasePrivate(const QAbstractClipBlendNode *node)
-    : Qt3DCore::QNodeCreatedChangeBasePrivate(node)
-{
-}
-
-/*!
-   \class Qt3DAnimation::QClipBlendNodeCreatedChangeBase
-   \inherits Qt3DCore::QNodeCreatedChangeBase
-   \inmodule Qt3DAnimation
-   \brief Base class for changes in QClipBlendNode.
-*/
-QClipBlendNodeCreatedChangeBase::QClipBlendNodeCreatedChangeBase(const QAbstractClipBlendNode *node)
-    : Qt3DCore::QNodeCreatedChangeBase(*new QClipBlendNodeCreatedChangeBasePrivate(node), node)
-{
-}
-
-QClipBlendNodeCreatedChangeBase::~QClipBlendNodeCreatedChangeBase()
-{
-}
-/*!
-    \typedef Qt3DAnimation::QClipBlendNodeCreatedChangeBasePtr
-
-    A shared pointer for QClipBlendNodeCreatedChangeBase.
-*/
-
-} // Qt3DAnimation
-
-QT_END_NAMESPACE
diff --git a/src/animation/frontend/qclipblendnodecreatedchange.h b/src/animation/frontend/qclipblendnodecreatedchange.h
deleted file mode 100644
index 094e8128e..000000000
--- a/src/animation/frontend/qclipblendnodecreatedchange.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QT3DANIMATION_QCLIPBLENDNODECREATEDCHANGE_H
-#define QT3DANIMATION_QCLIPBLENDNODECREATEDCHANGE_H
-
-#include <Qt3DCore/qnodecreatedchange.h>
-#include <Qt3DAnimation/qabstractclipblendnode.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DAnimation {
-
-class QAbstractClipBlendNode;
-class QClipBlendNodeCreatedChangeBasePrivate;
-
-class Q_3DANIMATIONSHARED_EXPORT QClipBlendNodeCreatedChangeBase : public Qt3DCore::QNodeCreatedChangeBase
-{
-public:
-    explicit QClipBlendNodeCreatedChangeBase(const QAbstractClipBlendNode *node);
-    ~QClipBlendNodeCreatedChangeBase();
-
-private:
-    Q_DECLARE_PRIVATE(QClipBlendNodeCreatedChangeBase)
-};
-
-typedef QSharedPointer<QClipBlendNodeCreatedChangeBase> QClipBlendNodeCreatedChangeBasePtr;
-
-template<typename T>
-class QClipBlendNodeCreatedChange : public QClipBlendNodeCreatedChangeBase
-{
-public:
-    explicit QClipBlendNodeCreatedChange(const QAbstractClipBlendNode *node)
-        : QClipBlendNodeCreatedChangeBase(node)
-        , data()
-    {
-    }
-
-    T data;
-};
-
-template<typename T>
-using QClipBlendNodeCreatedChangePtr = QSharedPointer<QClipBlendNodeCreatedChange<T>>;
-
-
-} // Qt3DAnimation
-
-QT_END_NAMESPACE
-
-#endif // QT3DANIMATION_QCLIPBLENDNODECREATEDCHANGE_H
diff --git a/src/animation/frontend/qclipblendnodecreatedchange_p.h b/src/animation/frontend/qclipblendnodecreatedchange_p.h
deleted file mode 100644
index 31342d3a8..000000000
--- a/src/animation/frontend/qclipblendnodecreatedchange_p.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QT3DANIMATION_QCLIPBLENDNODECREATEDCHANGE_P_H
-#define QT3DANIMATION_QCLIPBLENDNODECREATEDCHANGE_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists for the convenience
-// of other Qt classes.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <Qt3DCore/private/qnodecreatedchange_p.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DAnimation {
-
-class QAbstractClipBlendNode;
-
-class QClipBlendNodeCreatedChangeBasePrivate : public Qt3DCore::QNodeCreatedChangeBasePrivate
-{
-public:
-    QClipBlendNodeCreatedChangeBasePrivate(const QAbstractClipBlendNode *node);
-};
-
-} // Qt3DAnimation
-
-QT_END_NAMESPACE
-
-#endif // QT3DANIMATION_QCLIPBLENDNODECREATEDCHANGE_P_H
diff --git a/src/animation/frontend/qclipblendvalue.cpp b/src/animation/frontend/qclipblendvalue.cpp
index 053453e33..e7e8a8898 100644
--- a/src/animation/frontend/qclipblendvalue.cpp
+++ b/src/animation/frontend/qclipblendvalue.cpp
@@ -40,7 +40,6 @@
 #include "qclipblendvalue.h"
 #include "qclipblendvalue_p.h"
 #include <Qt3DAnimation/qabstractanimationclip.h>
-#include <Qt3DAnimation/qclipblendnodecreatedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -120,15 +119,6 @@ void QClipBlendValue::setClip(Qt3DAnimation::QAbstractAnimationClip *clip)
     emit clipChanged(clip);
 }
 
-Qt3DCore::QNodeCreatedChangeBasePtr QClipBlendValue::createNodeCreationChange() const
-{
-    Q_D(const QClipBlendValue);
-    auto creationChange = QClipBlendNodeCreatedChangePtr<QClipBlendValueData>::create(this);
-    QClipBlendValueData &data = creationChange->data;
-    data.clipId = Qt3DCore::qIdForNode(d->m_clip);
-    return creationChange;
-}
-
 } // namespace Qt3DAnimation
 
 QT_END_NAMESPACE
diff --git a/src/animation/frontend/qclipblendvalue.h b/src/animation/frontend/qclipblendvalue.h
index b97fc6e58..aaceed3b5 100644
--- a/src/animation/frontend/qclipblendvalue.h
+++ b/src/animation/frontend/qclipblendvalue.h
@@ -73,7 +73,6 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QClipBlendValue)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DAnimation
diff --git a/src/animation/frontend/qclock.cpp b/src/animation/frontend/qclock.cpp
index f38c21807..8d1cb5991 100644
--- a/src/animation/frontend/qclock.cpp
+++ b/src/animation/frontend/qclock.cpp
@@ -81,15 +81,6 @@ void QClock::setPlaybackRate(double playbackRate)
     emit playbackRateChanged(playbackRate);
 }
 
-Qt3DCore::QNodeCreatedChangeBasePtr QClock::createNodeCreationChange() const
-{
-    auto creationChange = Qt3DCore::QNodeCreatedChangePtr<QClockData>::create(this);
-    auto &data = creationChange->data;
-    Q_D(const QClock);
-    data.playbackRate = d->m_playbackRate;
-    return creationChange;
-}
-
 }
 
 QT_END_NAMESPACE
diff --git a/src/animation/frontend/qclock.h b/src/animation/frontend/qclock.h
index 8475f2831..14560f324 100644
--- a/src/animation/frontend/qclock.h
+++ b/src/animation/frontend/qclock.h
@@ -66,7 +66,6 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QClock)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DAnimation
diff --git a/src/animation/frontend/qlerpclipblend.cpp b/src/animation/frontend/qlerpclipblend.cpp
index 89ce3ca6f..29503ff6c 100644
--- a/src/animation/frontend/qlerpclipblend.cpp
+++ b/src/animation/frontend/qlerpclipblend.cpp
@@ -36,7 +36,6 @@
 
 #include "qlerpclipblend.h"
 #include "qlerpclipblend_p.h"
-#include <Qt3DAnimation/qclipblendnodecreatedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -106,17 +105,6 @@ QLerpClipBlend::~QLerpClipBlend()
 {
 }
 
-Qt3DCore::QNodeCreatedChangeBasePtr QLerpClipBlend::createNodeCreationChange() const
-{
-    Q_D(const QLerpClipBlend);
-    auto creationChange = QClipBlendNodeCreatedChangePtr<QLerpClipBlendData>::create(this);
-    QLerpClipBlendData &data = creationChange->data;
-    data.startClipId = Qt3DCore::qIdForNode(d->m_startClip);
-    data.endClipId = Qt3DCore::qIdForNode(d->m_endClip);
-    data.blendFactor = d->m_blendFactor;
-    return creationChange;
-}
-
 /*!
     \qmlproperty real LerpClipBlend::blendFactor
 
diff --git a/src/animation/frontend/qlerpclipblend.h b/src/animation/frontend/qlerpclipblend.h
index 6511d1c37..ce62e4e39 100644
--- a/src/animation/frontend/qlerpclipblend.h
+++ b/src/animation/frontend/qlerpclipblend.h
@@ -75,7 +75,6 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QLerpClipBlend)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // Qt3DAnimation
diff --git a/src/animation/frontend/qskeletonmapping.cpp b/src/animation/frontend/qskeletonmapping.cpp
index 7569a5bab..e13cd87ec 100644
--- a/src/animation/frontend/qskeletonmapping.cpp
+++ b/src/animation/frontend/qskeletonmapping.cpp
@@ -41,8 +41,6 @@
 #include "qskeletonmapping_p.h"
 #include <Qt3DCore/qabstractskeleton.h>
 
-#include <Qt3DAnimation/private/qchannelmappingcreatedchange_p.h>
-
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DAnimation {
@@ -51,7 +49,7 @@ QSkeletonMappingPrivate::QSkeletonMappingPrivate()
     : QAbstractChannelMappingPrivate()
     , m_skeleton(nullptr)
 {
-    m_mappingType = QChannelMappingCreatedChangeBase::SkeletonMapping;
+    m_mappingType = QAbstractChannelMappingPrivate::SkeletonMapping;
 }
 
 QSkeletonMapping::QSkeletonMapping(Qt3DCore::QNode *parent)
@@ -94,15 +92,6 @@ void QSkeletonMapping::setSkeleton(Qt3DCore::QAbstractSkeleton *skeleton)
     emit skeletonChanged(skeleton);
 }
 
-Qt3DCore::QNodeCreatedChangeBasePtr QSkeletonMapping::createNodeCreationChange() const
-{
-    auto creationChange = QChannelMappingCreatedChangePtr<QSkeletonMappingData>::create(this);
-    auto &data = creationChange->data;
-    Q_D(const QSkeletonMapping);
-    data.skeletonId = Qt3DCore::qIdForNode(d->m_skeleton);
-    return creationChange;
-}
-
 } // namespace Qt3DAnimation
 
 QT_END_NAMESPACE
diff --git a/src/animation/frontend/qskeletonmapping.h b/src/animation/frontend/qskeletonmapping.h
index 275fce818..5f37bfeb9 100644
--- a/src/animation/frontend/qskeletonmapping.h
+++ b/src/animation/frontend/qskeletonmapping.h
@@ -75,7 +75,6 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QSkeletonMapping)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
 };
 
 } // namespace Qt3DAnimation