Remove deprecated classes and functions

Mostly old messaging API

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

59 files changed, 62 insertions, 575 deletions

diff --git a/src/input/backend/backendnode_p.h b/src/input/backend/backendnode_p.h
index a7749852b..34fdc4362 100644
--- a/src/input/backend/backendnode_p.h
+++ b/src/input/backend/backendnode_p.h
@@ -53,6 +53,7 @@
 
 #include <Qt3DInput/private/qt3dinput_global_p.h>
 #include <Qt3DCore/qbackendnode.h>
+#include <Qt3DCore/qnode.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/input/backend/genericdevicebackendnode.cpp b/src/input/backend/genericdevicebackendnode.cpp
index d56a674fc..3d8c5750b 100644
--- a/src/input/backend/genericdevicebackendnode.cpp
+++ b/src/input/backend/genericdevicebackendnode.cpp
@@ -108,11 +108,11 @@ GenericDeviceBackendFunctor::GenericDeviceBackendFunctor(QInputAspect *inputaspe
 {
 }
 
-Qt3DCore::QBackendNode *GenericDeviceBackendFunctor::create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const
+Qt3DCore::QBackendNode *GenericDeviceBackendFunctor::create(Qt3DCore::QNodeId id) const
 {
-    GenericDeviceBackendNode *backendNode = m_handler->genericDeviceBackendNodeManager()->getOrCreateResource(change->subjectId());
+    GenericDeviceBackendNode *backendNode = m_handler->genericDeviceBackendNodeManager()->getOrCreateResource(id);
     backendNode->setInputAspect(m_inputAspect);
-    m_handler->appendGenericDevice(m_handler->genericDeviceBackendNodeManager()->lookupHandle(change->subjectId()));
+    m_handler->appendGenericDevice(m_handler->genericDeviceBackendNodeManager()->lookupHandle(id));
     return backendNode;
 }
 
diff --git a/src/input/backend/genericdevicebackendnode_p.h b/src/input/backend/genericdevicebackendnode_p.h
index 3ae712115..36b0d8c99 100644
--- a/src/input/backend/genericdevicebackendnode_p.h
+++ b/src/input/backend/genericdevicebackendnode_p.h
@@ -89,7 +89,7 @@ class GenericDeviceBackendFunctor : public Qt3DCore::QBackendNodeMapper
 public:
     explicit GenericDeviceBackendFunctor(QInputAspect *inputaspect, InputHandler *handler);
 
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const override;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNodeId id) const override;
     Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const override;
     void destroy(Qt3DCore::QNodeId id) const override;
 
diff --git a/src/input/backend/inputbackendnodefunctor_p.h b/src/input/backend/inputbackendnodefunctor_p.h
index 629e599f2..1d18025f0 100644
--- a/src/input/backend/inputbackendnodefunctor_p.h
+++ b/src/input/backend/inputbackendnodefunctor_p.h
@@ -69,9 +69,9 @@ public:
     {
     }
 
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const final
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNodeId id) const final
     {
-        Backend *backend = m_manager->getOrCreateResource(change->subjectId());
+        Backend *backend = m_manager->getOrCreateResource(id);
         return backend;
     }
 
diff --git a/src/input/backend/inputsettings.cpp b/src/input/backend/inputsettings.cpp
index 4fdd61a1b..ce4aa89d9 100644
--- a/src/input/backend/inputsettings.cpp
+++ b/src/input/backend/inputsettings.cpp
@@ -71,9 +71,9 @@ InputSettingsFunctor::InputSettingsFunctor(InputHandler *handler)
 {
 }
 
-Qt3DCore::QBackendNode *InputSettingsFunctor::create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const
+Qt3DCore::QBackendNode *InputSettingsFunctor::create(Qt3DCore::QNodeId id) const
 {
-    Q_UNUSED(change);
+    Q_UNUSED(id);
     if (m_handler->inputSettings() != nullptr) {
         qWarning() << "Input settings already specified";
         return nullptr;
diff --git a/src/input/backend/inputsettings_p.h b/src/input/backend/inputsettings_p.h
index 33f56cc0b..c495e18ec 100644
--- a/src/input/backend/inputsettings_p.h
+++ b/src/input/backend/inputsettings_p.h
@@ -79,7 +79,7 @@ class InputSettingsFunctor : public Qt3DCore::QBackendNodeMapper
 public:
     explicit InputSettingsFunctor(InputHandler *handler);
 
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const override;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNodeId id) const override;
     Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const override;
     void destroy(Qt3DCore::QNodeId id) const override;
 
diff --git a/src/input/backend/keyboarddevice.cpp b/src/input/backend/keyboarddevice.cpp
index 0e45d1c84..0a35cefbb 100644
--- a/src/input/backend/keyboarddevice.cpp
+++ b/src/input/backend/keyboarddevice.cpp
@@ -433,12 +433,12 @@ KeyboardDeviceFunctor::KeyboardDeviceFunctor(QInputAspect *inputaspect, InputHan
 {
 }
 
-Qt3DCore::QBackendNode *KeyboardDeviceFunctor::create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const
+Qt3DCore::QBackendNode *KeyboardDeviceFunctor::create(Qt3DCore::QNodeId id) const
 {
-    KeyboardDevice *keyboardDevice = m_handler->keyboardDeviceManager()->getOrCreateResource(change->subjectId());
+    KeyboardDevice *keyboardDevice = m_handler->keyboardDeviceManager()->getOrCreateResource(id);
     keyboardDevice->setInputAspect(m_inputAspect);
     keyboardDevice->setInputHandler(m_handler);
-    m_handler->appendKeyboardDevice(m_handler->keyboardDeviceManager()->lookupHandle(change->subjectId()));
+    m_handler->appendKeyboardDevice(m_handler->keyboardDeviceManager()->lookupHandle(id));
     return keyboardDevice;
 }
 
diff --git a/src/input/backend/keyboarddevice_p.h b/src/input/backend/keyboarddevice_p.h
index 2df5eb64d..76e207889 100644
--- a/src/input/backend/keyboarddevice_p.h
+++ b/src/input/backend/keyboarddevice_p.h
@@ -265,7 +265,7 @@ class KeyboardDeviceFunctor : public Qt3DCore::QBackendNodeMapper
 public:
     explicit KeyboardDeviceFunctor(QInputAspect *inputaspect, InputHandler *handler);
 
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const override;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNodeId id) const override;
     Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const override;
     void destroy(Qt3DCore::QNodeId id) const override;
 
diff --git a/src/input/backend/keyboardhandler.cpp b/src/input/backend/keyboardhandler.cpp
index 026012e52..f2e365ce2 100644
--- a/src/input/backend/keyboardhandler.cpp
+++ b/src/input/backend/keyboardhandler.cpp
@@ -120,9 +120,9 @@ KeyboardHandlerFunctor::KeyboardHandlerFunctor(InputHandler *handler)
 {
 }
 
-Qt3DCore::QBackendNode *KeyboardHandlerFunctor::create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const
+Qt3DCore::QBackendNode *KeyboardHandlerFunctor::create(Qt3DCore::QNodeId id) const
 {
-    KeyboardHandler *input = m_handler->keyboardInputManager()->getOrCreateResource(change->subjectId());
+    KeyboardHandler *input = m_handler->keyboardInputManager()->getOrCreateResource(id);
     input->setInputHandler(m_handler);
     return input;
 }
diff --git a/src/input/backend/keyboardhandler_p.h b/src/input/backend/keyboardhandler_p.h
index a5c13efbf..530361c97 100644
--- a/src/input/backend/keyboardhandler_p.h
+++ b/src/input/backend/keyboardhandler_p.h
@@ -91,7 +91,7 @@ class KeyboardHandlerFunctor : public Qt3DCore::QBackendNodeMapper
 public:
     explicit KeyboardHandlerFunctor(InputHandler *handler);
 
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const override;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNodeId id) const override;
     Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const override;
     void destroy(Qt3DCore::QNodeId id) const override;
 
diff --git a/src/input/backend/logicaldevice.cpp b/src/input/backend/logicaldevice.cpp
index 17426922f..0cd6534cf 100644
--- a/src/input/backend/logicaldevice.cpp
+++ b/src/input/backend/logicaldevice.cpp
@@ -80,9 +80,9 @@ LogicalDeviceNodeFunctor::LogicalDeviceNodeFunctor(LogicalDeviceManager *manager
 {
 }
 
-Qt3DCore::QBackendNode *LogicalDeviceNodeFunctor::create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const
+Qt3DCore::QBackendNode *LogicalDeviceNodeFunctor::create(Qt3DCore::QNodeId id) const
 {
-    HLogicalDevice handle = m_manager->getOrAcquireHandle(change->subjectId());
+    HLogicalDevice handle = m_manager->getOrAcquireHandle(id);
     LogicalDevice *backend = m_manager->data(handle);
     m_manager->addActiveDevice(handle);
     return backend;
diff --git a/src/input/backend/logicaldevice_p.h b/src/input/backend/logicaldevice_p.h
index 292f2a5c3..6e75e0e77 100644
--- a/src/input/backend/logicaldevice_p.h
+++ b/src/input/backend/logicaldevice_p.h
@@ -84,7 +84,7 @@ class LogicalDeviceNodeFunctor : public Qt3DCore::QBackendNodeMapper
 public:
     explicit LogicalDeviceNodeFunctor(LogicalDeviceManager *manager);
 
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const final;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNodeId id) const final;
     Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const final;
     void destroy(Qt3DCore::QNodeId id) const final;
 
diff --git a/src/input/backend/mousedevice.cpp b/src/input/backend/mousedevice.cpp
index c5b2a22ce..5c4ebf6ab 100644
--- a/src/input/backend/mousedevice.cpp
+++ b/src/input/backend/mousedevice.cpp
@@ -187,12 +187,12 @@ MouseDeviceFunctor::MouseDeviceFunctor(QInputAspect *inputAspect, InputHandler *
 {
 }
 
-Qt3DCore::QBackendNode *MouseDeviceFunctor::create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const
+Qt3DCore::QBackendNode *MouseDeviceFunctor::create(Qt3DCore::QNodeId id) const
 {
-    MouseDevice *controller = m_handler->mouseDeviceManager()->getOrCreateResource(change->subjectId());
+    MouseDevice *controller = m_handler->mouseDeviceManager()->getOrCreateResource(id);
     controller->setInputAspect(m_inputAspect);
     controller->setInputHandler(m_handler);
-    m_handler->appendMouseDevice(m_handler->mouseDeviceManager()->lookupHandle(change->subjectId()));
+    m_handler->appendMouseDevice(m_handler->mouseDeviceManager()->lookupHandle(id));
     return controller;
 }
 
diff --git a/src/input/backend/mousedevice_p.h b/src/input/backend/mousedevice_p.h
index d41bb527b..41f51ba27 100644
--- a/src/input/backend/mousedevice_p.h
+++ b/src/input/backend/mousedevice_p.h
@@ -126,7 +126,7 @@ class MouseDeviceFunctor : public Qt3DCore::QBackendNodeMapper
 public:
     explicit MouseDeviceFunctor(Qt3DInput::QInputAspect *inputAspect, InputHandler *handler);
 
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const override;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNodeId id) const override;
     Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const override;
     void destroy(Qt3DCore::QNodeId id) const override;
 
diff --git a/src/input/backend/mousehandler.cpp b/src/input/backend/mousehandler.cpp
index 9c7ff9817..bef28912e 100644
--- a/src/input/backend/mousehandler.cpp
+++ b/src/input/backend/mousehandler.cpp
@@ -96,9 +96,9 @@ MouseHandlerFunctor::MouseHandlerFunctor(InputHandler *handler)
 {
 }
 
-Qt3DCore::QBackendNode *MouseHandlerFunctor::create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const
+Qt3DCore::QBackendNode *MouseHandlerFunctor::create(Qt3DCore::QNodeId id) const
 {
-    MouseHandler *input = m_handler->mouseInputManager()->getOrCreateResource(change->subjectId());
+    MouseHandler *input = m_handler->mouseInputManager()->getOrCreateResource(id);
     input->setInputHandler(m_handler);
     return input;
 }
diff --git a/src/input/backend/mousehandler_p.h b/src/input/backend/mousehandler_p.h
index 693c42471..df6a1c12e 100644
--- a/src/input/backend/mousehandler_p.h
+++ b/src/input/backend/mousehandler_p.h
@@ -84,7 +84,7 @@ class MouseHandlerFunctor : public Qt3DCore::QBackendNodeMapper
 public:
     explicit MouseHandlerFunctor(InputHandler *handler);
 
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const override;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNodeId id) const override;
     Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const override;
     void destroy(Qt3DCore::QNodeId id) const override;
 
diff --git a/src/input/backend/physicaldeviceproxy.cpp b/src/input/backend/physicaldeviceproxy.cpp
index 390b525eb..f30233530 100644
--- a/src/input/backend/physicaldeviceproxy.cpp
+++ b/src/input/backend/physicaldeviceproxy.cpp
@@ -117,9 +117,9 @@ PhysicalDeviceProxyNodeFunctor::PhysicalDeviceProxyNodeFunctor(PhysicalDevicePro
 {
 }
 
-Qt3DCore::QBackendNode *PhysicalDeviceProxyNodeFunctor::create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const
+Qt3DCore::QBackendNode *PhysicalDeviceProxyNodeFunctor::create(Qt3DCore::QNodeId id) const
 {
-    HPhysicalDeviceProxy handle = m_manager->getOrAcquireHandle(change->subjectId());
+    HPhysicalDeviceProxy handle = m_manager->getOrAcquireHandle(id);
     PhysicalDeviceProxy *backend = m_manager->data(handle);
     backend->setManager(m_manager);
     return backend;
diff --git a/src/input/backend/physicaldeviceproxy_p.h b/src/input/backend/physicaldeviceproxy_p.h
index 6dd2a54be..3ec8c92e6 100644
--- a/src/input/backend/physicaldeviceproxy_p.h
+++ b/src/input/backend/physicaldeviceproxy_p.h
@@ -92,7 +92,7 @@ class PhysicalDeviceProxyNodeFunctor: public Qt3DCore::QBackendNodeMapper
 public:
     explicit PhysicalDeviceProxyNodeFunctor(PhysicalDeviceProxyManager *manager);
 
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const final;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNodeId id) const final;
     Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const final;
     void destroy(Qt3DCore::QNodeId id) const final;
 
diff --git a/src/input/backend/qabstractphysicaldevicebackendnode.cpp b/src/input/backend/qabstractphysicaldevicebackendnode.cpp
index 6e6899e32..18d932a21 100644
--- a/src/input/backend/qabstractphysicaldevicebackendnode.cpp
+++ b/src/input/backend/qabstractphysicaldevicebackendnode.cpp
@@ -43,7 +43,6 @@
 #include <Qt3DInput/qabstractphysicaldevice.h>
 #include <Qt3DInput/qaxissetting.h>
 #include <Qt3DInput/qinputaspect.h>
-#include <Qt3DInput/qphysicaldevicecreatedchange.h>
 
 #include <cmath>
 #include <algorithm>
diff --git a/src/input/frontend/frontend.pri b/src/input/frontend/frontend.pri
index ecde941a3..e86e00b64 100644
--- a/src/input/frontend/frontend.pri
+++ b/src/input/frontend/frontend.pri
@@ -42,8 +42,6 @@ HEADERS += \
     $$PWD/qaxissetting_p.h \
     $$PWD/qinputsequence_p.h \
     $$PWD/qinputchord_p.h \
-    $$PWD/qphysicaldevicecreatedchange.h \
-    $$PWD/qphysicaldevicecreatedchange_p.h \
     $$PWD/qaxisaccumulator.h \
     $$PWD/qaxisaccumulator_p.h \
     $$PWD/qabstractphysicaldeviceproxy_p.h \
@@ -75,7 +73,6 @@ SOURCES += \
     $$PWD/qinputchord.cpp \
     $$PWD/qinputsequence.cpp \
     $$PWD/qinputsettings.cpp \
-    $$PWD/qphysicaldevicecreatedchange.cpp \
     $$PWD/qaxisaccumulator.cpp \
     $$PWD/qabstractphysicaldeviceproxy.cpp
 
diff --git a/src/input/frontend/qabstractaxisinput.cpp b/src/input/frontend/qabstractaxisinput.cpp
index e3974421a..d7022835d 100644
--- a/src/input/frontend/qabstractaxisinput.cpp
+++ b/src/input/frontend/qabstractaxisinput.cpp
@@ -40,7 +40,6 @@
 #include "qabstractaxisinput_p.h"
 
 #include <Qt3DInput/qabstractaxisinput.h>
-#include <Qt3DCore/qnodecreatedchange.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/input/frontend/qabstractphysicaldevice.cpp b/src/input/frontend/qabstractphysicaldevice.cpp
index 33c86f7b8..100852d2a 100644
--- a/src/input/frontend/qabstractphysicaldevice.cpp
+++ b/src/input/frontend/qabstractphysicaldevice.cpp
@@ -41,7 +41,6 @@
 #include "qabstractphysicaldevice_p.h"
 
 #include <Qt3DInput/qaxissetting.h>
-#include <Qt3DInput/qphysicaldevicecreatedchange.h>
 
 #include <Qt3DCore/private/qnode_p.h>
 
@@ -165,7 +164,7 @@ void QAbstractPhysicalDevice::addAxisSetting(QAxisSetting *axisSetting)
 {
     Q_D(QAbstractPhysicalDevice);
     if (axisSetting && !d->m_axisSettings.contains(axisSetting)) {
-        d->updateNode(axisSetting, "axisSettings", Qt3DCore::PropertyValueAdded);
+        d->update();
         d->m_axisSettings.push_back(axisSetting);
     }
 }
@@ -177,7 +176,7 @@ void QAbstractPhysicalDevice::removeAxisSetting(QAxisSetting *axisSetting)
 {
     Q_D(QAbstractPhysicalDevice);
     if (axisSetting && d->m_axisSettings.contains(axisSetting)) {
-        d->updateNode(axisSetting, "axisSettings", Qt3DCore::PropertyValueRemoved);
+        d->update();
         d->m_axisSettings.removeOne(axisSetting);
     }
 }
@@ -209,15 +208,6 @@ void QAbstractPhysicalDevicePrivate::postButtonEvent(int button, qreal value)
     update();
 }
 
-/*!
-    \internal
-*/
-Qt3DCore::QNodeCreatedChangeBasePtr QAbstractPhysicalDevice::createNodeCreationChange() const
-{
-    auto creationChange = QPhysicalDeviceCreatedChangeBasePtr::create(this);
-    return creationChange;
-}
-
 }
 
 QT_END_NAMESPACE
diff --git a/src/input/frontend/qabstractphysicaldevice.h b/src/input/frontend/qabstractphysicaldevice.h
index 9e95d05f0..3161443ae 100644
--- a/src/input/frontend/qabstractphysicaldevice.h
+++ b/src/input/frontend/qabstractphysicaldevice.h
@@ -75,7 +75,6 @@ public:
 protected:
     QAbstractPhysicalDevice(QAbstractPhysicalDevicePrivate &dd, Qt3DCore::QNode *parent = nullptr);
     Q_DECLARE_PRIVATE(QAbstractPhysicalDevice)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // Qt3DInput
diff --git a/src/input/frontend/qabstractphysicaldeviceproxy.cpp b/src/input/frontend/qabstractphysicaldeviceproxy.cpp
index 4ed116440..ae1401921 100644
--- a/src/input/frontend/qabstractphysicaldeviceproxy.cpp
+++ b/src/input/frontend/qabstractphysicaldeviceproxy.cpp
@@ -40,8 +40,6 @@
 #include "qabstractphysicaldeviceproxy_p.h"
 #include "qabstractphysicaldeviceproxy_p_p.h"
 
-#include <Qt3DInput/qphysicaldevicecreatedchange.h>
-
 
 QT_BEGIN_NAMESPACE
 
@@ -167,20 +165,6 @@ QAbstractPhysicalDeviceProxy::QAbstractPhysicalDeviceProxy(QAbstractPhysicalDevi
 /*!
     \internal
  */
-Qt3DCore::QNodeCreatedChangeBasePtr QAbstractPhysicalDeviceProxy::createNodeCreationChange() const
-{
-    auto creationChange = QPhysicalDeviceCreatedChangePtr<QAbstractPhysicalDeviceProxyData>::create(this);
-    QAbstractPhysicalDeviceProxyData &data = creationChange->data;
-
-    Q_D(const QAbstractPhysicalDeviceProxy);
-    data.deviceName = d->m_deviceName;
-
-    return creationChange;
-}
-
-/*!
-    \internal
- */
 void QAbstractPhysicalDeviceProxyPrivate::setDevice(QAbstractPhysicalDevice *device)
 {
     Q_Q(QAbstractPhysicalDeviceProxy);
diff --git a/src/input/frontend/qabstractphysicaldeviceproxy_p.h b/src/input/frontend/qabstractphysicaldeviceproxy_p.h
index 4a7b1dfc5..512679191 100644
--- a/src/input/frontend/qabstractphysicaldeviceproxy_p.h
+++ b/src/input/frontend/qabstractphysicaldeviceproxy_p.h
@@ -89,7 +89,6 @@ Q_SIGNALS:
 
 protected:
     QAbstractPhysicalDeviceProxy(QAbstractPhysicalDeviceProxyPrivate &dd, Qt3DCore::QNode *parent = nullptr);
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 
 private:
     Q_DECLARE_PRIVATE(QAbstractPhysicalDeviceProxy)
diff --git a/src/input/frontend/qaction.cpp b/src/input/frontend/qaction.cpp
index 8cceaab51..c13aaa6bd 100644
--- a/src/input/frontend/qaction.cpp
+++ b/src/input/frontend/qaction.cpp
@@ -41,7 +41,6 @@
 #include "qaction_p.h"
 
 #include <Qt3DInput/qabstractactioninput.h>
-#include <Qt3DCore/qnodecreatedchange.h>
 
 #include <Qt3DCore/private/qnode_p.h>
 
@@ -118,7 +117,7 @@ void QAction::addInput(QAbstractActionInput *input)
         // Ensures proper bookkeeping
         d->registerDestructionHelper(input, &QAction::removeInput, d->m_inputs);
 
-        d->updateNode(input, "inputs", Qt3DCore::PropertyValueAdded);
+        d->update();
     }
 }
 
@@ -130,7 +129,7 @@ void QAction::removeInput(QAbstractActionInput *input)
     Q_D(QAction);
     if (d->m_inputs.contains(input)) {
 
-        d->updateNode(input, "inputs", Qt3DCore::PropertyValueRemoved);
+        d->update();
 
         d->m_inputs.removeOne(input);
 
@@ -148,19 +147,6 @@ QVector<QAbstractActionInput *> QAction::inputs() const
     return d->m_inputs;
 }
 
-// TODO Unused remove in Qt6
-void QAction::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &)
-{
-}
-
-Qt3DCore::QNodeCreatedChangeBasePtr QAction::createNodeCreationChange() const
-{
-    auto creationChange = Qt3DCore::QNodeCreatedChangePtr<QActionData>::create(this);
-    auto &data = creationChange->data;
-    data.inputIds = qIdsForNodes(inputs());
-    return creationChange;
-}
-
 } // Qt3DInput
 
 QT_END_NAMESPACE
diff --git a/src/input/frontend/qaction.h b/src/input/frontend/qaction.h
index ef74debe5..63a9c7033 100644
--- a/src/input/frontend/qaction.h
+++ b/src/input/frontend/qaction.h
@@ -67,13 +67,8 @@ public:
 Q_SIGNALS:
     void activeChanged(bool isActive);
 
-protected:
-    // TODO Unused remove in Qt6
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override;
-
 private:
     Q_DECLARE_PRIVATE(QAction)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // Qt3DInput
diff --git a/src/input/frontend/qactioninput.cpp b/src/input/frontend/qactioninput.cpp
index f013147f2..42db5d28f 100644
--- a/src/input/frontend/qactioninput.cpp
+++ b/src/input/frontend/qactioninput.cpp
@@ -41,7 +41,6 @@
 
 #include <Qt3DInput/qabstractphysicaldevice.h>
 #include <Qt3DInput/qabstractactioninput.h>
-#include <Qt3DCore/qnodecreatedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -198,18 +197,6 @@ void QActionInput::setButtons(const QVector<int> &buttons)
     }
 }
 
-Qt3DCore::QNodeCreatedChangeBasePtr QActionInput::createNodeCreationChange() const
-{
-    auto creationChange = Qt3DCore::QNodeCreatedChangePtr<QActionInputData>::create(this);
-    auto &data = creationChange->data;
-
-    Q_D(const QActionInput);
-    data.sourceDeviceId = qIdForNode(d->m_sourceDevice);
-    data.buttons = d->m_buttons;
-
-    return creationChange;
-}
-
 } // Qt3DInput
 
 QT_END_NAMESPACE
diff --git a/src/input/frontend/qactioninput.h b/src/input/frontend/qactioninput.h
index be620c5fb..7bc9a768d 100644
--- a/src/input/frontend/qactioninput.h
+++ b/src/input/frontend/qactioninput.h
@@ -74,7 +74,6 @@ Q_SIGNALS:
 
 private:
     Q_DECLARE_PRIVATE(QActionInput)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // Qt3DInput
diff --git a/src/input/frontend/qanalogaxisinput.cpp b/src/input/frontend/qanalogaxisinput.cpp
index 7b85983e3..8503fe4db 100644
--- a/src/input/frontend/qanalogaxisinput.cpp
+++ b/src/input/frontend/qanalogaxisinput.cpp
@@ -109,18 +109,6 @@ int QAnalogAxisInput::axis() const
     return d->m_axis;
 }
 
-Qt3DCore::QNodeCreatedChangeBasePtr QAnalogAxisInput::createNodeCreationChange() const
-{
-    auto creationChange = Qt3DCore::QNodeCreatedChangePtr<QAnalogAxisInputData>::create(this);
-    auto &data = creationChange->data;
-
-    Q_D(const QAnalogAxisInput);
-    data.sourceDeviceId = qIdForNode(d->m_sourceDevice);
-    data.axis = d->m_axis;
-
-    return creationChange;
-}
-
 } // Qt3DInput
 
 QT_END_NAMESPACE
diff --git a/src/input/frontend/qanalogaxisinput.h b/src/input/frontend/qanalogaxisinput.h
index fca13a822..058c19df8 100644
--- a/src/input/frontend/qanalogaxisinput.h
+++ b/src/input/frontend/qanalogaxisinput.h
@@ -68,7 +68,6 @@ Q_SIGNALS:
 
 private:
     Q_DECLARE_PRIVATE(QAnalogAxisInput)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // Qt3DInput
diff --git a/src/input/frontend/qaxis.cpp b/src/input/frontend/qaxis.cpp
index d76135fd7..d41cf904f 100644
--- a/src/input/frontend/qaxis.cpp
+++ b/src/input/frontend/qaxis.cpp
@@ -40,7 +40,6 @@
 #include "qaxis_p.h"
 
 #include <Qt3DInput/qabstractaxisinput.h>
-#include <Qt3DCore/qnodecreatedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -114,7 +113,7 @@ void QAxis::addInput(QAbstractAxisInput *input)
 
         // Ensures proper bookkeeping
         d->registerDestructionHelper(input, &QAxis::removeInput, d->m_inputs);
-        d->updateNode(input, "input", Qt3DCore::PropertyValueAdded);
+        d->update();
     }
 }
 
@@ -136,7 +135,7 @@ void QAxis::removeInput(QAbstractAxisInput *input)
     Q_D(QAxis);
     if (d->m_inputs.contains(input)) {
 
-        d->updateNode(input, "input", Qt3DCore::PropertyValueRemoved);
+        d->update();
 
         d->m_inputs.removeOne(input);
 
@@ -167,19 +166,6 @@ float QAxis::value() const
     return d->m_value;
 }
 
-// TODO Unused remove in Qt6
-void QAxis::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &)
-{
-}
-
-Qt3DCore::QNodeCreatedChangeBasePtr QAxis::createNodeCreationChange() const
-{
-    auto creationChange = Qt3DCore::QNodeCreatedChangePtr<QAxisData>::create(this);
-    auto &data = creationChange->data;
-    data.inputIds = qIdsForNodes(inputs());
-    return creationChange;
-}
-
 } // Qt3DInput
 
 QT_END_NAMESPACE
diff --git a/src/input/frontend/qaxis.h b/src/input/frontend/qaxis.h
index 3dbe54a4f..4482dbedc 100644
--- a/src/input/frontend/qaxis.h
+++ b/src/input/frontend/qaxis.h
@@ -66,13 +66,8 @@ public:
 Q_SIGNALS:
     void valueChanged(float value);
 
-protected:
-    // TODO Unused remove in Qt6
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override;
-
 private:
     Q_DECLARE_PRIVATE(QAxis)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // Qt3DInput
diff --git a/src/input/frontend/qaxisaccumulator.cpp b/src/input/frontend/qaxisaccumulator.cpp
index a7bb14441..94942126e 100644
--- a/src/input/frontend/qaxisaccumulator.cpp
+++ b/src/input/frontend/qaxisaccumulator.cpp
@@ -41,7 +41,6 @@
 #include "qaxisaccumulator_p.h"
 
 #include <Qt3DInput/qaxis.h>
-#include <Qt3DCore/qnodecreatedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -289,23 +288,6 @@ void QAxisAccumulator::setScale(float scale)
     emit scaleChanged(scale);
 }
 
-// TODO Unused remove in Qt6
-void QAxisAccumulator::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &)
-{
-}
-
-/*! \internal */
-Qt3DCore::QNodeCreatedChangeBasePtr QAxisAccumulator::createNodeCreationChange() const
-{
-    auto creationChange = Qt3DCore::QNodeCreatedChangePtr<QAxisAccumulatorData>::create(this);
-    auto &data = creationChange->data;
-    Q_D(const QAxisAccumulator);
-    data.sourceAxisId = qIdForNode(d->m_sourceAxis);
-    data.sourceAxisType = d->m_sourceAxisType;
-    data.scale = d->m_scale;
-    return creationChange;
-}
-
 } // namespace Qt3DInput
 
 QT_END_NAMESPACE
diff --git a/src/input/frontend/qaxisaccumulator.h b/src/input/frontend/qaxisaccumulator.h
index e711b0691..4f12f2a69 100644
--- a/src/input/frontend/qaxisaccumulator.h
+++ b/src/input/frontend/qaxisaccumulator.h
@@ -87,13 +87,8 @@ Q_SIGNALS:
     void velocityChanged(float value);
     void scaleChanged(float scale);
 
-protected:
-    // TODO Unused remove in Qt6
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override;
-
 private:
     Q_DECLARE_PRIVATE(QAxisAccumulator)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DInput
diff --git a/src/input/frontend/qaxissetting.cpp b/src/input/frontend/qaxissetting.cpp
index 4a8f37785..d5ea709f6 100644
--- a/src/input/frontend/qaxissetting.cpp
+++ b/src/input/frontend/qaxissetting.cpp
@@ -40,8 +40,6 @@
 #include "qaxissetting.h"
 #include "qaxissetting_p.h"
 
-#include <Qt3DCore/qnodecreatedchange.h>
-
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DInput {
@@ -226,19 +224,6 @@ void QAxisSetting::setSmoothEnabled(bool enabled)
     emit smoothChanged(enabled);
 }
 
-Qt3DCore::QNodeCreatedChangeBasePtr QAxisSetting::createNodeCreationChange() const
-{
-    auto creationChange = Qt3DCore::QNodeCreatedChangePtr<QAxisSettingData>::create(this);
-    auto &data = creationChange->data;
-
-    Q_D(const QAxisSetting);
-    data.deadZoneRadius = d->m_deadZoneRadius;
-    data.axes = d->m_axes;
-    data.smooth = d->m_smooth;
-
-    return creationChange;
-}
-
 } // namespace Qt3DInput
 
 QT_END_NAMESPACE
diff --git a/src/input/frontend/qaxissetting.h b/src/input/frontend/qaxissetting.h
index 979643e39..5f814cf8a 100644
--- a/src/input/frontend/qaxissetting.h
+++ b/src/input/frontend/qaxissetting.h
@@ -77,7 +77,6 @@ Q_SIGNALS:
 
 private:
     Q_DECLARE_PRIVATE(QAxisSetting)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DInput
diff --git a/src/input/frontend/qbuttonaxisinput.cpp b/src/input/frontend/qbuttonaxisinput.cpp
index fb74b8efd..6cd997156 100644
--- a/src/input/frontend/qbuttonaxisinput.cpp
+++ b/src/input/frontend/qbuttonaxisinput.cpp
@@ -176,21 +176,6 @@ void QButtonAxisInput::setDeceleration(float deceleration)
     }
 }
 
-Qt3DCore::QNodeCreatedChangeBasePtr QButtonAxisInput::createNodeCreationChange() const
-{
-    auto creationChange = Qt3DCore::QNodeCreatedChangePtr<QButtonAxisInputData>::create(this);
-    auto &data = creationChange->data;
-
-    Q_D(const QButtonAxisInput);
-    data.sourceDeviceId = qIdForNode(d->m_sourceDevice);
-    data.buttons = d->m_buttons;
-    data.scale = d->m_scale;
-    data.acceleration = d->m_acceleration;
-    data.deceleration = d->m_deceleration;
-
-    return creationChange;
-}
-
 } // Qt3DInput
 
 QT_END_NAMESPACE
diff --git a/src/input/frontend/qbuttonaxisinput.h b/src/input/frontend/qbuttonaxisinput.h
index 15c6eec28..e17b6d94e 100644
--- a/src/input/frontend/qbuttonaxisinput.h
+++ b/src/input/frontend/qbuttonaxisinput.h
@@ -83,7 +83,6 @@ Q_SIGNALS:
 
 private:
     Q_DECLARE_PRIVATE(QButtonAxisInput)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // Qt3DInput
diff --git a/src/input/frontend/qinputaspect.cpp b/src/input/frontend/qinputaspect.cpp
index e109461f0..e91e545bb 100644
--- a/src/input/frontend/qinputaspect.cpp
+++ b/src/input/frontend/qinputaspect.cpp
@@ -145,26 +145,26 @@ QInputAspect::QInputAspect(QInputAspectPrivate &dd, QObject *parent)
 
     qRegisterMetaType<Qt3DInput::QAbstractPhysicalDevice*>();
 
-    registerBackendType<QKeyboardDevice, true>(QBackendNodeMapperPtr(new Input::KeyboardDeviceFunctor(this, d_func()->m_inputHandler.data())));
-    registerBackendType<QKeyboardHandler, true>(QBackendNodeMapperPtr(new Input::KeyboardHandlerFunctor(d_func()->m_inputHandler.data())));
-    registerBackendType<QMouseDevice, true>(QBackendNodeMapperPtr(new Input::MouseDeviceFunctor(this, d_func()->m_inputHandler.data())));
-    registerBackendType<QMouseHandler, true>(QBackendNodeMapperPtr(new Input::MouseHandlerFunctor(d_func()->m_inputHandler.data())));
-    registerBackendType<QAxis, true>(QBackendNodeMapperPtr(new Input::InputNodeFunctor<Input::Axis, Input::AxisManager>(d_func()->m_inputHandler->axisManager())));
-    registerBackendType<QAxisAccumulator, true>(QBackendNodeMapperPtr(new Input::InputNodeFunctor<Input::AxisAccumulator, Input::AxisAccumulatorManager>(d_func()->m_inputHandler->axisAccumulatorManager())));
-    registerBackendType<QAnalogAxisInput, true>(QBackendNodeMapperPtr(new Input::InputNodeFunctor<Input::AnalogAxisInput, Input::AnalogAxisInputManager>(d_func()->m_inputHandler->analogAxisInputManager())));
-    registerBackendType<QButtonAxisInput, true>(QBackendNodeMapperPtr(new Input::InputNodeFunctor<Input::ButtonAxisInput, Input::ButtonAxisInputManager>(d_func()->m_inputHandler->buttonAxisInputManager())));
-    registerBackendType<QAxisSetting, true>(QBackendNodeMapperPtr(new Input::InputNodeFunctor<Input::AxisSetting, Input::AxisSettingManager>(d_func()->m_inputHandler->axisSettingManager())));
-    registerBackendType<Qt3DInput::QAction, true>(QBackendNodeMapperPtr(new Input::InputNodeFunctor<Input::Action, Input::ActionManager>(d_func()->m_inputHandler->actionManager())));
-    registerBackendType<QActionInput,  true>(QBackendNodeMapperPtr(new Input::InputNodeFunctor<Input::ActionInput, Input::ActionInputManager>(d_func()->m_inputHandler->actionInputManager())));
-    registerBackendType<QInputChord, true>(QBackendNodeMapperPtr(new Input::InputNodeFunctor<Input::InputChord, Input::InputChordManager>(d_func()->m_inputHandler->inputChordManager())));
-    registerBackendType<QInputSequence, true>(QBackendNodeMapperPtr(new Input::InputNodeFunctor<Input::InputSequence, Input::InputSequenceManager>(d_func()->m_inputHandler->inputSequenceManager())));
-    registerBackendType<QLogicalDevice, true>(QBackendNodeMapperPtr(new Input::LogicalDeviceNodeFunctor(d_func()->m_inputHandler->logicalDeviceManager())));
-    registerBackendType<QGenericInputDevice, true>(QBackendNodeMapperPtr(new Input::GenericDeviceBackendFunctor(this, d_func()->m_inputHandler.data())));
-    registerBackendType<QInputSettings, true>(QBackendNodeMapperPtr(new Input::InputSettingsFunctor(d_func()->m_inputHandler.data())));
-    registerBackendType<QAbstractPhysicalDeviceProxy, true>(QBackendNodeMapperPtr(new Input::PhysicalDeviceProxyNodeFunctor(d_func()->m_inputHandler->physicalDeviceProxyManager())));
+    registerBackendType<QKeyboardDevice>(QBackendNodeMapperPtr(new Input::KeyboardDeviceFunctor(this, d_func()->m_inputHandler.data())));
+    registerBackendType<QKeyboardHandler>(QBackendNodeMapperPtr(new Input::KeyboardHandlerFunctor(d_func()->m_inputHandler.data())));
+    registerBackendType<QMouseDevice>(QBackendNodeMapperPtr(new Input::MouseDeviceFunctor(this, d_func()->m_inputHandler.data())));
+    registerBackendType<QMouseHandler>(QBackendNodeMapperPtr(new Input::MouseHandlerFunctor(d_func()->m_inputHandler.data())));
+    registerBackendType<QAxis>(QBackendNodeMapperPtr(new Input::InputNodeFunctor<Input::Axis, Input::AxisManager>(d_func()->m_inputHandler->axisManager())));
+    registerBackendType<QAxisAccumulator>(QBackendNodeMapperPtr(new Input::InputNodeFunctor<Input::AxisAccumulator, Input::AxisAccumulatorManager>(d_func()->m_inputHandler->axisAccumulatorManager())));
+    registerBackendType<QAnalogAxisInput>(QBackendNodeMapperPtr(new Input::InputNodeFunctor<Input::AnalogAxisInput, Input::AnalogAxisInputManager>(d_func()->m_inputHandler->analogAxisInputManager())));
+    registerBackendType<QButtonAxisInput>(QBackendNodeMapperPtr(new Input::InputNodeFunctor<Input::ButtonAxisInput, Input::ButtonAxisInputManager>(d_func()->m_inputHandler->buttonAxisInputManager())));
+    registerBackendType<QAxisSetting>(QBackendNodeMapperPtr(new Input::InputNodeFunctor<Input::AxisSetting, Input::AxisSettingManager>(d_func()->m_inputHandler->axisSettingManager())));
+    registerBackendType<Qt3DInput::QAction>(QBackendNodeMapperPtr(new Input::InputNodeFunctor<Input::Action, Input::ActionManager>(d_func()->m_inputHandler->actionManager())));
+    registerBackendType<QActionInput>(QBackendNodeMapperPtr(new Input::InputNodeFunctor<Input::ActionInput, Input::ActionInputManager>(d_func()->m_inputHandler->actionInputManager())));
+    registerBackendType<QInputChord>(QBackendNodeMapperPtr(new Input::InputNodeFunctor<Input::InputChord, Input::InputChordManager>(d_func()->m_inputHandler->inputChordManager())));
+    registerBackendType<QInputSequence>(QBackendNodeMapperPtr(new Input::InputNodeFunctor<Input::InputSequence, Input::InputSequenceManager>(d_func()->m_inputHandler->inputSequenceManager())));
+    registerBackendType<QLogicalDevice>(QBackendNodeMapperPtr(new Input::LogicalDeviceNodeFunctor(d_func()->m_inputHandler->logicalDeviceManager())));
+    registerBackendType<QGenericInputDevice>(QBackendNodeMapperPtr(new Input::GenericDeviceBackendFunctor(this, d_func()->m_inputHandler.data())));
+    registerBackendType<QInputSettings>(QBackendNodeMapperPtr(new Input::InputSettingsFunctor(d_func()->m_inputHandler.data())));
+    registerBackendType<QAbstractPhysicalDeviceProxy>(QBackendNodeMapperPtr(new Input::PhysicalDeviceProxyNodeFunctor(d_func()->m_inputHandler->physicalDeviceProxyManager())));
 
 #ifdef HAVE_QGAMEPAD
-    registerBackendType<QGamepadInput, true>(QBackendNodeMapperPtr(new Input::GenericDeviceBackendFunctor(this, d_func()->m_inputHandler.data())));
+    registerBackendType<QGamepadInput>(QBackendNodeMapperPtr(new Input::GenericDeviceBackendFunctor(this, d_func()->m_inputHandler.data())));
 #endif
 
     Q_D(QInputAspect);
diff --git a/src/input/frontend/qinputchord.cpp b/src/input/frontend/qinputchord.cpp
index 0c4d15190..474e25254 100644
--- a/src/input/frontend/qinputchord.cpp
+++ b/src/input/frontend/qinputchord.cpp
@@ -40,7 +40,6 @@
 #include "qinputchord_p.h"
 
 #include <Qt3DInput/qabstractphysicaldevice.h>
-#include <Qt3DCore/qnodecreatedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -154,7 +153,7 @@ void QInputChord::addChord(QAbstractActionInput *input)
         if (!input->parent())
             input->setParent(this);
 
-        d->updateNode(input, "input", Qt3DCore::PropertyValueAdded);
+        d->update();
     }
 }
 
@@ -167,7 +166,7 @@ void QInputChord::removeChord(QAbstractActionInput *input)
 {
     Q_D(QInputChord);
     if (d->m_chords.contains(input)) {
-        d->updateNode(input, "input", Qt3DCore::PropertyValueRemoved);
+        d->update();
 
         d->m_chords.removeOne(input);
 
@@ -185,18 +184,6 @@ QVector<QAbstractActionInput *> QInputChord::chords() const
     return d->m_chords;
 }
 
-Qt3DCore::QNodeCreatedChangeBasePtr QInputChord::createNodeCreationChange() const
-{
-    auto creationChange = Qt3DCore::QNodeCreatedChangePtr<QInputChordData>::create(this);
-    QInputChordData &data = creationChange->data;
-
-    Q_D(const QInputChord);
-    data.chordIds = qIdsForNodes(chords());
-    data.timeout = d->m_timeout;
-
-    return creationChange;
-}
-
 QInputChordPrivate::QInputChordPrivate()
     : QAbstractActionInputPrivate(),
       m_timeout(0)
diff --git a/src/input/frontend/qinputchord.h b/src/input/frontend/qinputchord.h
index 570590229..fd917c745 100644
--- a/src/input/frontend/qinputchord.h
+++ b/src/input/frontend/qinputchord.h
@@ -74,7 +74,6 @@ Q_SIGNALS:
 
 private:
     Q_DECLARE_PRIVATE(QInputChord)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // Qt3DInput
diff --git a/src/input/frontend/qinputsequence.cpp b/src/input/frontend/qinputsequence.cpp
index d59ebc0f3..ba571bbb9 100644
--- a/src/input/frontend/qinputsequence.cpp
+++ b/src/input/frontend/qinputsequence.cpp
@@ -41,7 +41,6 @@
 
 #include <Qt3DInput/qabstractactioninput.h>
 #include <Qt3DInput/qabstractphysicaldevice.h>
-#include <Qt3DCore/qnodecreatedchange.h>
 
 #include <Qt3DCore/private/qnode_p.h>
 
@@ -207,7 +206,7 @@ void QInputSequence::addSequence(QAbstractActionInput *input)
         if (!input->parent())
             input->setParent(this);
 
-        d->updateNode(input, "input", Qt3DCore::PropertyValueAdded);
+        d->update();
     }
 }
 
@@ -220,7 +219,7 @@ void QInputSequence::removeSequence(QAbstractActionInput *input)
 {
     Q_D(QInputSequence);
     if (d->m_sequences.contains(input)) {
-        d->updateNode(input, "input", Qt3DCore::PropertyValueRemoved);
+        d->update();
 
         d->m_sequences.removeOne(input);
 
@@ -238,19 +237,6 @@ QVector<QAbstractActionInput *> QInputSequence::sequences() const
     return d->m_sequences;
 }
 
-Qt3DCore::QNodeCreatedChangeBasePtr QInputSequence::createNodeCreationChange() const
-{
-    auto creationChange = Qt3DCore::QNodeCreatedChangePtr<QInputSequenceData>::create(this);
-    QInputSequenceData &data = creationChange->data;
-
-    Q_D(const QInputSequence);
-    data.sequenceIds = qIdsForNodes(sequences());
-    data.timeout = d->m_timeout;
-    data.buttonInterval = d->m_buttonInterval;
-
-    return creationChange;
-}
-
 } // Qt3DInput
 
 QT_END_NAMESPACE
diff --git a/src/input/frontend/qinputsequence.h b/src/input/frontend/qinputsequence.h
index 9d4aea6fc..47e4aa488 100644
--- a/src/input/frontend/qinputsequence.h
+++ b/src/input/frontend/qinputsequence.h
@@ -78,7 +78,6 @@ Q_SIGNALS:
 
 private:
     Q_DECLARE_PRIVATE(QInputSequence)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // Qt3DInput
diff --git a/src/input/frontend/qinputsettings.cpp b/src/input/frontend/qinputsettings.cpp
index ccc53e47b..8ed302ac9 100644
--- a/src/input/frontend/qinputsettings.cpp
+++ b/src/input/frontend/qinputsettings.cpp
@@ -40,8 +40,6 @@
 #include "qinputsettings.h"
 #include "qinputsettings_p.h"
 
-#include <Qt3DCore/qnodecreatedchange.h>
-
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DInput {
@@ -132,17 +130,6 @@ void QInputSettings::eventSourceDestroyed()
     emit eventSourceChanged(nullptr);
 }
 
-Qt3DCore::QNodeCreatedChangeBasePtr QInputSettings::createNodeCreationChange() const
-{
-    auto creationChange = Qt3DCore::QNodeCreatedChangePtr<QInputSettingsData>::create(this);
-    auto &data = creationChange->data;
-
-    Q_D(const QInputSettings);
-    data.eventSource = d->m_eventSource;
-
-    return creationChange;
-}
-
 } // Qt3DInput
 
 
diff --git a/src/input/frontend/qinputsettings.h b/src/input/frontend/qinputsettings.h
index 10e883ac4..cc1e5bdce 100644
--- a/src/input/frontend/qinputsettings.h
+++ b/src/input/frontend/qinputsettings.h
@@ -67,7 +67,6 @@ Q_SIGNALS:
 
 private:
     Q_DECLARE_PRIVATE(QInputSettings)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
     void eventSourceDestroyed();
 };
 
diff --git a/src/input/frontend/qkeyboarddevice.cpp b/src/input/frontend/qkeyboarddevice.cpp
index 1ec1f8ead..0fe3a1338 100644
--- a/src/input/frontend/qkeyboarddevice.cpp
+++ b/src/input/frontend/qkeyboarddevice.cpp
@@ -309,11 +309,6 @@ QKeyboardDevice::QKeyboardDevice(QKeyboardDevicePrivate &dd, QNode *parent)
 {
 }
 
-// TODO Unused remove in Qt6
-void QKeyboardDevice::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &)
-{
-}
-
 /*!
  * Set the active input to \a activeInput
  */
diff --git a/src/input/frontend/qkeyboarddevice.h b/src/input/frontend/qkeyboarddevice.h
index df2f47020..ee4b864f7 100644
--- a/src/input/frontend/qkeyboarddevice.h
+++ b/src/input/frontend/qkeyboarddevice.h
@@ -71,8 +71,6 @@ public:
 
 protected:
     explicit QKeyboardDevice(QKeyboardDevicePrivate &dd, QNode *parent = nullptr);
-    // TODO Unused remove in Qt6
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override;
 
 Q_SIGNALS:
     void activeInputChanged(QKeyboardHandler *activeInput);
diff --git a/src/input/frontend/qkeyboardhandler.cpp b/src/input/frontend/qkeyboardhandler.cpp
index 92ce39c31..5126c4692 100644
--- a/src/input/frontend/qkeyboardhandler.cpp
+++ b/src/input/frontend/qkeyboardhandler.cpp
@@ -237,23 +237,6 @@ void QKeyboardHandler::setFocus(bool focus)
     }
 }
 
-// TODO Unused remove in Qt6
-void QKeyboardHandler::sceneChangeEvent(const QSceneChangePtr &)
-{
-}
-
-Qt3DCore::QNodeCreatedChangeBasePtr QKeyboardHandler::createNodeCreationChange() const
-{
-    auto creationChange = Qt3DCore::QNodeCreatedChangePtr<QKeyboardHandlerData>::create(this);
-    auto &data = creationChange->data;
-
-    Q_D(const QKeyboardHandler);
-    data.keyboardDeviceId = qIdForNode(d->m_keyboardDevice);
-    data.focus = d->m_focus;
-
-    return creationChange;
-}
-
 /*!
     \qmlsignal Qt3D.Input::KeyboardHandler::digit0Pressed(KeyEvent event)
 
diff --git a/src/input/frontend/qkeyboardhandler.h b/src/input/frontend/qkeyboardhandler.h
index b4425de72..1ee9ef1af 100644
--- a/src/input/frontend/qkeyboardhandler.h
+++ b/src/input/frontend/qkeyboardhandler.h
@@ -115,13 +115,8 @@ Q_SIGNALS:
     void pressed(Qt3DInput::QKeyEvent *event);
     void released(Qt3DInput::QKeyEvent *event);
 
-protected:
-    // TODO Unused remove in Qt6
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override;
-
 private:
     Q_DECLARE_PRIVATE(QKeyboardHandler)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DInput
diff --git a/src/input/frontend/qlogicaldevice.cpp b/src/input/frontend/qlogicaldevice.cpp
index 44e04baa8..cf723f9aa 100644
--- a/src/input/frontend/qlogicaldevice.cpp
+++ b/src/input/frontend/qlogicaldevice.cpp
@@ -40,7 +40,6 @@
 #include "qlogicaldevice.h"
 #include "qlogicaldevice_p.h"
 
-#include <Qt3DCore/qnodecreatedchange.h>
 #include <Qt3DInput/qaction.h>
 #include <Qt3DInput/qaxis.h>
 
@@ -173,7 +172,7 @@ void QLogicalDevice::addAction(QAction *action)
         // Ensures proper bookkeeping
         d->registerDestructionHelper(action, &QLogicalDevice::removeAction, d->m_actions);
 
-        d->updateNode(action, "action", Qt3DCore::PropertyValueAdded);
+        d->update();
     }
 }
 
@@ -184,7 +183,7 @@ void QLogicalDevice::removeAction(QAction *action)
 {
     Q_D(QLogicalDevice);
     if (d->m_actions.contains(action)) {
-        d->updateNode(action, "action", Qt3DCore::PropertyValueRemoved);
+        d->update();
 
         d->m_actions.removeOne(action);
 
@@ -224,7 +223,7 @@ void QLogicalDevice::addAxis(QAxis *axis)
         // Ensures proper bookkeeping
         d->registerDestructionHelper(axis, &QLogicalDevice::removeAxis, d->m_axes);
 
-        d->updateNode(axis, "axis", Qt3DCore::PropertyValueAdded);
+        d->update();
     }
 }
 
@@ -235,7 +234,7 @@ void QLogicalDevice::removeAxis(QAxis *axis)
 {
     Q_D(QLogicalDevice);
     if (d->m_axes.contains(axis)) {
-        d->updateNode(axis, "axis", Qt3DCore::PropertyValueRemoved);
+        d->update();
 
         d->m_axes.removeOne(axis);
 
@@ -253,15 +252,6 @@ QVector<QAxis *> QLogicalDevice::axes() const
     return d->m_axes;
 }
 
-Qt3DCore::QNodeCreatedChangeBasePtr QLogicalDevice::createNodeCreationChange() const
-{
-    auto creationChange = Qt3DCore::QNodeCreatedChangePtr<QLogicalDeviceData>::create(this);
-    auto &data = creationChange->data;
-    data.actionIds = qIdsForNodes(actions());
-    data.axisIds = qIdsForNodes(axes());
-    return creationChange;
-}
-
 } // Qt3DInput
 
 QT_END_NAMESPACE
diff --git a/src/input/frontend/qlogicaldevice.h b/src/input/frontend/qlogicaldevice.h
index b60000717..5f8a08e6e 100644
--- a/src/input/frontend/qlogicaldevice.h
+++ b/src/input/frontend/qlogicaldevice.h
@@ -68,7 +68,6 @@ public:
 
 private:
     Q_DECLARE_PRIVATE(QLogicalDevice)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // Qt3DInput
diff --git a/src/input/frontend/qmousedevice.cpp b/src/input/frontend/qmousedevice.cpp
index 5872fbcd2..36d3a1b3c 100644
--- a/src/input/frontend/qmousedevice.cpp
+++ b/src/input/frontend/qmousedevice.cpp
@@ -41,7 +41,6 @@
 #include "qmousedevice_p.h"
 
 #include <Qt3DInput/qmouseevent.h>
-#include <Qt3DInput/qphysicaldevicecreatedchange.h>
 #include <Qt3DCore/qentity.h>
 
 QT_BEGIN_NAMESPACE
@@ -259,24 +258,6 @@ void QMouseDevice::setUpdateAxesContinuously(bool updateAxesContinuously)
     emit updateAxesContinuouslyChanged(updateAxesContinuously);
 }
 
-/*! \internal */
-void QMouseDevice::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change)
-{
-    Q_UNUSED(change);
-    // TODO: To be completed as the mouse input aspect takes shape
-}
-
-Qt3DCore::QNodeCreatedChangeBasePtr QMouseDevice::createNodeCreationChange() const
-{
-    auto creationChange = QPhysicalDeviceCreatedChangePtr<QMouseDeviceData>::create(this);
-    auto &data = creationChange->data;
-
-    Q_D(const QMouseDevice);
-    data.sensitivity = d->m_sensitivity;
-
-    return creationChange;
-}
-
 } // namespace Qt3DInput
 
 QT_END_NAMESPACE
diff --git a/src/input/frontend/qmousedevice.h b/src/input/frontend/qmousedevice.h
index 7754c2e29..66ad39e0f 100644
--- a/src/input/frontend/qmousedevice.h
+++ b/src/input/frontend/qmousedevice.h
@@ -88,12 +88,8 @@ Q_SIGNALS:
     void sensitivityChanged(float value);
     void updateAxesContinuouslyChanged(bool updateAxesContinuously);
 
-protected:
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override;
-
 private:
     Q_DECLARE_PRIVATE(QMouseDevice)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DInput
diff --git a/src/input/frontend/qmousehandler.cpp b/src/input/frontend/qmousehandler.cpp
index 89d76a057..49ccce0c5 100644
--- a/src/input/frontend/qmousehandler.cpp
+++ b/src/input/frontend/qmousehandler.cpp
@@ -298,10 +298,6 @@ void QMouseHandler::setSourceDevice(QMouseDevice *mouseDevice)
     }
 }
 
-// TODO Unused remove in Qt6
-void QMouseHandler::sceneChangeEvent(const QSceneChangePtr &)
-{
-}
 
 /*!
  * \property Qt3DInput::QMouseHandler::sourceDevice
@@ -339,17 +335,6 @@ void QMouseHandler::setContainsMouse(bool contains)
     }
 }
 
-Qt3DCore::QNodeCreatedChangeBasePtr QMouseHandler::createNodeCreationChange() const
-{
-    auto creationChange = Qt3DCore::QNodeCreatedChangePtr<QMouseHandlerData>::create(this);
-    auto &data = creationChange->data;
-
-    Q_D(const QMouseHandler);
-    data.mouseDeviceId = qIdForNode(d->m_mouseDevice);
-
-    return creationChange;
-}
-
 } // namespace Qt3DInput
 
 QT_END_NAMESPACE
diff --git a/src/input/frontend/qmousehandler.h b/src/input/frontend/qmousehandler.h
index d95dbf4c3..307d30e9f 100644
--- a/src/input/frontend/qmousehandler.h
+++ b/src/input/frontend/qmousehandler.h
@@ -87,13 +87,10 @@ Q_SIGNALS:
 #endif
 
 protected:
-    // TODO Unused remove in Qt6
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override;
     void setContainsMouse(bool contains);
 
 private:
     Q_DECLARE_PRIVATE(QMouseHandler)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DInput
diff --git a/src/input/frontend/qphysicaldevicecreatedchange.cpp b/src/input/frontend/qphysicaldevicecreatedchange.cpp
deleted file mode 100644
index 905633b7f..000000000
--- a/src/input/frontend/qphysicaldevicecreatedchange.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 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 "qphysicaldevicecreatedchange.h"
-#include "qphysicaldevicecreatedchange_p.h"
-
-#include <Qt3DInput/qabstractphysicaldevice.h>
-#include <Qt3DInput/qaxissetting.h>
-#include <Qt3DCore/qnodeid.h>
-
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DInput {
-
-QPhysicalDeviceCreatedChangeBasePrivate::QPhysicalDeviceCreatedChangeBasePrivate(const QAbstractPhysicalDevice *device)
-    : Qt3DCore::QNodeCreatedChangeBasePrivate(device)
-    , m_axisSettingIds(Qt3DCore::qIdsForNodes(device->axisSettings()))
-{
-
-}
-
-/*!
-    \class Qt3DInput::QPhysicalDeviceCreatedChangeBase
-    \inmodule Qt3DInput
-    \brief Base class for handling changes in physical devices.
-*/
-QPhysicalDeviceCreatedChangeBase::QPhysicalDeviceCreatedChangeBase(const QAbstractPhysicalDevice *device)
-    : Qt3DCore::QNodeCreatedChangeBase(*new QPhysicalDeviceCreatedChangeBasePrivate(device), device)
-{
-}
-
-/*! \internal */
-QPhysicalDeviceCreatedChangeBase::~QPhysicalDeviceCreatedChangeBase()
-{
-}
-
-/*!
-    Returns a list of node ids.
-*/
-Qt3DCore::QNodeIdVector Qt3DInput::QPhysicalDeviceCreatedChangeBase::axisSettingIds() const
-{
-    Q_D(const QPhysicalDeviceCreatedChangeBase);
-    return d->m_axisSettingIds;
-}
-
-QT_END_NAMESPACE
-
-} // namespace Qt3DInput
diff --git a/src/input/frontend/qphysicaldevicecreatedchange.h b/src/input/frontend/qphysicaldevicecreatedchange.h
deleted file mode 100644
index 6ffe559e9..000000000
--- a/src/input/frontend/qphysicaldevicecreatedchange.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 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 QT3DINPUT_QPHYSICALDEVICECREATIONCHANGEBASE_H
-#define QT3DINPUT_QPHYSICALDEVICECREATIONCHANGEBASE_H
-
-#include <Qt3DInput/qt3dinput_global.h>
-#include <Qt3DCore/qnodecreatedchange.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DInput {
-
-class QAbstractPhysicalDevice;
-class QPhysicalDeviceCreatedChangeBasePrivate;
-
-class Q_3DINPUTSHARED_EXPORT QPhysicalDeviceCreatedChangeBase : public Qt3DCore::QNodeCreatedChangeBase
-{
-public:
-    explicit QPhysicalDeviceCreatedChangeBase(const QAbstractPhysicalDevice *device);
-    ~QPhysicalDeviceCreatedChangeBase();
-
-    Qt3DCore::QNodeIdVector axisSettingIds() const;
-
-private:
-    Q_DECLARE_PRIVATE(QPhysicalDeviceCreatedChangeBase)
-};
-
-typedef QSharedPointer<QPhysicalDeviceCreatedChangeBase> QPhysicalDeviceCreatedChangeBasePtr;
-
-template<typename T>
-class QPhysicalDeviceCreatedChange : public QPhysicalDeviceCreatedChangeBase
-{
-public:
-    explicit QPhysicalDeviceCreatedChange(const QAbstractPhysicalDevice *_device)
-        : QPhysicalDeviceCreatedChangeBase(_device)
-        , data()
-    {
-    }
-
-    T data;
-};
-
-template<typename T>
-using QPhysicalDeviceCreatedChangePtr = QSharedPointer<QPhysicalDeviceCreatedChange<T>>;
-
-} // namespace Qt3DInput
-
-QT_END_NAMESPACE
-
-#endif // QT3DINPUT_QPHYSICALDEVICECREATIONCHANGEBASE_H
diff --git a/src/input/frontend/qphysicaldevicecreatedchange_p.h b/src/input/frontend/qphysicaldevicecreatedchange_p.h
deleted file mode 100644
index 7dcc7eb47..000000000
--- a/src/input/frontend/qphysicaldevicecreatedchange_p.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 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 QT3DINPUT_QPHYSICALDEVICECREATEDCHANGEBASE_P_H
-#define QT3DINPUT_QPHYSICALDEVICECREATEDCHANGEBASE_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 Qt3DInput {
-
-class QAbstractPhysicalDevice;
-
-class QPhysicalDeviceCreatedChangeBasePrivate : public Qt3DCore::QNodeCreatedChangeBasePrivate
-{
-public:
-    QPhysicalDeviceCreatedChangeBasePrivate(const QAbstractPhysicalDevice *device);
-
-    Qt3DCore::QNodeIdVector m_axisSettingIds;
-};
-
-} // namespace Qt3DInput
-
-QT_END_NAMESPACE
-
-#endif // QT3DINPUT_QPHYSICALDEVICECREATEDCHANGEBASE_P_H