Remove deprecated classes and functions

Mostly old messaging API

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

50 files changed, 21 insertions, 616 deletions

diff --git a/src/render/framegraph/framegraph.pri b/src/render/framegraph/framegraph.pri
index a622bd281..61a75cae0 100644
--- a/src/render/framegraph/framegraph.pri
+++ b/src/render/framegraph/framegraph.pri
@@ -48,8 +48,6 @@ HEADERS += \
     $$PWD/qbuffercapture.h \
     $$PWD/qbuffercapture_p.h \
     $$PWD/buffercapture_p.h \
-    $$PWD/qframegraphnodecreatedchange.h \
-    $$PWD/qframegraphnodecreatedchange_p.h \
     $$PWD/qmemorybarrier.h \
     $$PWD/qmemorybarrier_p.h \
     $$PWD/memorybarrier_p.h \
@@ -108,7 +106,6 @@ SOURCES += \
     $$PWD/rendercapture.cpp \
     $$PWD/qbuffercapture.cpp \
     $$PWD/buffercapture.cpp \
-    $$PWD/qframegraphnodecreatedchange.cpp \
     $$PWD/qmemorybarrier.cpp \
     $$PWD/memorybarrier.cpp \
     $$PWD/qproximityfilter.cpp \
diff --git a/src/render/framegraph/framegraphnode.cpp b/src/render/framegraph/framegraphnode.cpp
index 92116af7d..9f58f5899 100644
--- a/src/render/framegraph/framegraphnode.cpp
+++ b/src/render/framegraph/framegraphnode.cpp
@@ -40,7 +40,6 @@
 #include "framegraphnode_p.h"
 #include <Qt3DRender/private/abstractrenderer_p.h>
 #include <Qt3DRender/private/nodemanagers_p.h>
-#include <Qt3DRender/qframegraphnodecreatedchange.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/framegraph/framegraphnode_p.h b/src/render/framegraph/framegraphnode_p.h
index 92d7ae2f1..de0969786 100644
--- a/src/render/framegraph/framegraphnode_p.h
+++ b/src/render/framegraph/framegraphnode_p.h
@@ -146,9 +146,9 @@ public:
     {
     }
 
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const override
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNodeId id) const override
     {
-        return createBackendFrameGraphNode(change);
+        return createBackendFrameGraphNode(id);
     }
 
     Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const override
@@ -162,16 +162,16 @@ public:
     }
 
 protected:
-    Backend *createBackendFrameGraphNode(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const
+    Backend *createBackendFrameGraphNode(const Qt3DCore::QNodeId &id) const
     {
-        if (!m_manager->containsNode(change->subjectId())) {
+        if (!m_manager->containsNode(id)) {
             Backend *backend = new Backend();
             backend->setFrameGraphManager(m_manager);
             backend->setRenderer(m_renderer);
-            m_manager->appendNode(change->subjectId(), backend);
+            m_manager->appendNode(id, backend);
             return backend;
         }
-        return static_cast<Backend *>(m_manager->lookupNode(change->subjectId()));
+        return static_cast<Backend *>(m_manager->lookupNode(id));
     }
 
 private:
diff --git a/src/render/framegraph/qblitframebuffer.cpp b/src/render/framegraph/qblitframebuffer.cpp
index 252758af4..356b2db06 100644
--- a/src/render/framegraph/qblitframebuffer.cpp
+++ b/src/render/framegraph/qblitframebuffer.cpp
@@ -40,8 +40,6 @@
 #include "qblitframebuffer.h"
 #include "qblitframebuffer_p.h"
 
-#include <Qt3DRender/qframegraphnodecreatedchange.h>
-
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
@@ -434,25 +432,6 @@ void QBlitFramebuffer::setInterpolationMethod(QBlitFramebuffer::InterpolationMet
     }
 }
 
-/*!
-    \internal
- */
-Qt3DCore::QNodeCreatedChangeBasePtr QBlitFramebuffer::createNodeCreationChange() const
-{
-    auto creationChange = QFrameGraphNodeCreatedChangePtr<QBlitFramebufferData>::create(this);
-    auto &data = creationChange->data;
-    Q_D(const QBlitFramebuffer);
-    data.m_sourceRect = d->m_sourceRect;
-    data.m_destinationRect = d->m_destinationRect;
-    data.m_sourceRenderTargetId = Qt3DCore::qIdForNode(d->m_source);
-    data.m_destinationRenderTargetId = Qt3DCore::qIdForNode(d->m_destination);
-    data.m_sourceAttachmentPoint = d->m_sourceAttachmentPoint;
-    data.m_destinationAttachmentPoint = d->m_destinationAttachmentPoint;
-    data.m_interpolationMethod = d->m_interpolationMethod;
-
-    return creationChange;
-}
-
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/framegraph/qblitframebuffer.h b/src/render/framegraph/qblitframebuffer.h
index 79c216d24..22c422928 100644
--- a/src/render/framegraph/qblitframebuffer.h
+++ b/src/render/framegraph/qblitframebuffer.h
@@ -101,7 +101,6 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QBlitFramebuffer)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/framegraph/qbuffercapture.cpp b/src/render/framegraph/qbuffercapture.cpp
index 3eaa5dfd2..49b923534 100644
--- a/src/render/framegraph/qbuffercapture.cpp
+++ b/src/render/framegraph/qbuffercapture.cpp
@@ -39,8 +39,6 @@
 
 #include <Qt3DRender/qbuffercapture.h>
 #include <Qt3DRender/private/qbuffercapture_p.h>
-#include <Qt3DCore/qscenechange.h>
-#include <Qt3DRender/qframegraphnodecreatedchange.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/framegraph/qcameraselector.cpp b/src/render/framegraph/qcameraselector.cpp
index af293dc56..f9deba592 100644
--- a/src/render/framegraph/qcameraselector.cpp
+++ b/src/render/framegraph/qcameraselector.cpp
@@ -41,7 +41,6 @@
 #include "qcameraselector_p.h"
 #include <Qt3DCore/qentity.h>
 #include <Qt3DCore/private/qentity_p.h>
-#include <Qt3DRender/qframegraphnodecreatedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -139,15 +138,6 @@ Qt3DCore::QEntity *QCameraSelector::camera() const
     return d->m_camera;
 }
 
-Qt3DCore::QNodeCreatedChangeBasePtr QCameraSelector::createNodeCreationChange() const
-{
-    auto creationChange = QFrameGraphNodeCreatedChangePtr<QCameraSelectorData>::create(this);
-    auto &data = creationChange->data;
-    Q_D(const QCameraSelector);
-    data.cameraId = qIdForNode(d->m_camera);
-    return creationChange;
-}
-
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/framegraph/qcameraselector.h b/src/render/framegraph/qcameraselector.h
index 861948d94..61d730f57 100644
--- a/src/render/framegraph/qcameraselector.h
+++ b/src/render/framegraph/qcameraselector.h
@@ -71,7 +71,6 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QCameraSelector)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/framegraph/qclearbuffers.cpp b/src/render/framegraph/qclearbuffers.cpp
index 31a31420c..177f6f097 100644
--- a/src/render/framegraph/qclearbuffers.cpp
+++ b/src/render/framegraph/qclearbuffers.cpp
@@ -39,7 +39,6 @@
 
 #include "qclearbuffers.h"
 #include "qclearbuffers_p.h"
-#include <Qt3DRender/qframegraphnodecreatedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -232,19 +231,6 @@ void QClearBuffers::setColorBuffer(QRenderTargetOutput *buffer)
     }
 }
 
-Qt3DCore::QNodeCreatedChangeBasePtr QClearBuffers::createNodeCreationChange() const
-{
-    auto creationChange = QFrameGraphNodeCreatedChangePtr<QClearBuffersData>::create(this);
-    auto &data = creationChange->data;
-    Q_D(const QClearBuffers);
-    data.buffersType = d->m_buffersType;
-    data.clearColor = d->m_clearColor;
-    data.clearDepthValue = d->m_clearDepthValue;
-    data.clearStencilValue = d->m_clearStencilValue;
-    data.bufferId = Qt3DCore::qIdForNode(d->m_buffer);
-    return creationChange;
-}
-
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/framegraph/qclearbuffers.h b/src/render/framegraph/qclearbuffers.h
index 441a83e78..ed6c441bc 100644
--- a/src/render/framegraph/qclearbuffers.h
+++ b/src/render/framegraph/qclearbuffers.h
@@ -102,7 +102,6 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QClearBuffers)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/framegraph/qdispatchcompute.cpp b/src/render/framegraph/qdispatchcompute.cpp
index 6e018d8ef..f9d1df621 100644
--- a/src/render/framegraph/qdispatchcompute.cpp
+++ b/src/render/framegraph/qdispatchcompute.cpp
@@ -39,7 +39,6 @@
 
 #include "qdispatchcompute.h"
 #include "qdispatchcompute_p.h"
-#include <Qt3DRender/qframegraphnodecreatedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -162,17 +161,6 @@ void QDispatchCompute::setWorkGroupZ(int workGroupZ)
 
 }
 
-Qt3DCore::QNodeCreatedChangeBasePtr QDispatchCompute::createNodeCreationChange() const
-{
-    auto creationChange = QFrameGraphNodeCreatedChangePtr<QDispatchComputeData>::create(this);
-    auto &data = creationChange->data;
-    Q_D(const QDispatchCompute);
-    data.workGroupX = d->m_workGroupX;
-    data.workGroupY = d->m_workGroupY;
-    data.workGroupZ = d->m_workGroupZ;
-    return creationChange;
-}
-
 } // Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/framegraph/qdispatchcompute.h b/src/render/framegraph/qdispatchcompute.h
index dd6efb3ec..96a5f1796 100644
--- a/src/render/framegraph/qdispatchcompute.h
+++ b/src/render/framegraph/qdispatchcompute.h
@@ -75,7 +75,6 @@ Q_SIGNALS:
 
 private:
     Q_DECLARE_PRIVATE(QDispatchCompute)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // Qt3DRender
diff --git a/src/render/framegraph/qframegraphnode.cpp b/src/render/framegraph/qframegraphnode.cpp
index f49f6433a..797e24324 100644
--- a/src/render/framegraph/qframegraphnode.cpp
+++ b/src/render/framegraph/qframegraphnode.cpp
@@ -39,7 +39,6 @@
 
 #include "qframegraphnode.h"
 #include "qframegraphnode_p.h"
-#include <Qt3DRender/qframegraphnodecreatedchange.h>
 
 #include <Qt3DCore/QNode>
 
@@ -305,15 +304,6 @@ QFrameGraphNode::QFrameGraphNode(QFrameGraphNodePrivate &dd, QNode *parent)
 {
 }
 
-Qt3DCore::QNodeCreatedChangeBasePtr QFrameGraphNode::createNodeCreationChange() const
-{
-    // connect to the parentChanged signal here rather than constructor because
-    // until now there's no backend node to notify when parent changes
-    connect(this, &QNode::parentChanged, this, &QFrameGraphNode::onParentChanged);
-
-    return QFrameGraphNodeCreatedChangeBasePtr::create(this);
-}
-
 void QFrameGraphNode::onParentChanged(QObject *)
 {
     // Direct sync update request
diff --git a/src/render/framegraph/qframegraphnode.h b/src/render/framegraph/qframegraphnode.h
index 826f01a1e..647d36764 100644
--- a/src/render/framegraph/qframegraphnode.h
+++ b/src/render/framegraph/qframegraphnode.h
@@ -61,7 +61,6 @@ public:
 
 protected:
     explicit QFrameGraphNode(QFrameGraphNodePrivate &dd, Qt3DCore::QNode *parent = nullptr);
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 
 private Q_SLOTS:
     void onParentChanged(QObject *);
diff --git a/src/render/framegraph/qframegraphnodecreatedchange.cpp b/src/render/framegraph/qframegraphnodecreatedchange.cpp
deleted file mode 100644
index 464c98bc3..000000000
--- a/src/render/framegraph/qframegraphnodecreatedchange.cpp
+++ /dev/null
@@ -1,78 +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 "qframegraphnodecreatedchange.h"
-#include "qframegraphnodecreatedchange_p.h"
-
-#include <Qt3DRender/qframegraphnode.h>
-#include <Qt3DRender/private/qframegraphnode_p.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DRender {
-
-QFrameGraphNodeCreatedChangeBasePrivate::QFrameGraphNodeCreatedChangeBasePrivate(const QFrameGraphNode *node)
-    : Qt3DCore::QNodeCreatedChangeBasePrivate(node)
-    , m_parentFrameGraphNodeId(Qt3DCore::qIdForNode(node->parentFrameGraphNode()))
-    , m_childFrameGraphNodeIds(Qt3DCore::qIdsForNodes(QFrameGraphNodePrivate::get(node)->childFrameGraphNodes()))
-{
-}
-
-/*!
-    \class Qt3DRender::QFrameGraphNodeCreatedChangeBase
-    \inmodule Qt3DRender
-
-    \brief A base class for changes in the FrameGraphNode.
-*/
-QFrameGraphNodeCreatedChangeBase::QFrameGraphNodeCreatedChangeBase(const QFrameGraphNode *node)
-    : Qt3DCore::QNodeCreatedChangeBase(*new QFrameGraphNodeCreatedChangeBasePrivate(node), node)
-{
-}
-
-/*! \internal */
-QFrameGraphNodeCreatedChangeBase::~QFrameGraphNodeCreatedChangeBase()
-{
-}
-
-Qt3DCore::QNodeId QFrameGraphNodeCreatedChangeBase::parentFrameGraphNodeId() const
-{
-    Q_D(const QFrameGraphNodeCreatedChangeBase);
-    return d->m_parentFrameGraphNodeId;
-}
-
-} // Qt3DRender
-
-QT_END_NAMESPACE
diff --git a/src/render/framegraph/qframegraphnodecreatedchange.h b/src/render/framegraph/qframegraphnodecreatedchange.h
deleted file mode 100644
index 96ca0fb38..000000000
--- a/src/render/framegraph/qframegraphnodecreatedchange.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 QT3DRENDER_RENDER_QFRAMEGRAPHNODECREATEDCHANGE_H
-#define QT3DRENDER_RENDER_QFRAMEGRAPHNODECREATEDCHANGE_H
-
-#include <Qt3DCore/qnodecreatedchange.h>
-#include <Qt3DRender/qt3drender_global.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DRender {
-
-class QFrameGraphNode;
-class QFrameGraphNodeCreatedChangeBasePrivate;
-
-class Q_3DRENDERSHARED_EXPORT QFrameGraphNodeCreatedChangeBase : public Qt3DCore::QNodeCreatedChangeBase
-{
-public:
-    explicit QFrameGraphNodeCreatedChangeBase(const QFrameGraphNode *node);
-    ~QFrameGraphNodeCreatedChangeBase();
-
-    Qt3DCore::QNodeId parentFrameGraphNodeId() const;
-
-private:
-    Q_DECLARE_PRIVATE(QFrameGraphNodeCreatedChangeBase)
-};
-
-typedef QSharedPointer<QFrameGraphNodeCreatedChangeBase> QFrameGraphNodeCreatedChangeBasePtr;
-
-template<typename T>
-class QFrameGraphNodeCreatedChange : public QFrameGraphNodeCreatedChangeBase
-{
-public:
-    explicit QFrameGraphNodeCreatedChange(const QFrameGraphNode *node)
-        : QFrameGraphNodeCreatedChangeBase(node)
-        , data()
-    {
-    }
-
-    T data;
-};
-
-template<typename T>
-using QFrameGraphNodeCreatedChangePtr = QSharedPointer<QFrameGraphNodeCreatedChange<T>>;
-
-} // Qt3DRender
-
-QT_END_NAMESPACE
-
-#endif // QT3DRENDER_RENDER_QFRAMEGRAPHNODECREATEDCHANGE_H
diff --git a/src/render/framegraph/qframegraphnodecreatedchange_p.h b/src/render/framegraph/qframegraphnodecreatedchange_p.h
deleted file mode 100644
index c0437afc5..000000000
--- a/src/render/framegraph/qframegraphnodecreatedchange_p.h
+++ /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$
-**
-****************************************************************************/
-
-#ifndef QT3DRENDER_RENDER_QFRAMEGRAPHNODECREATEDCHANGE_P_H
-#define QT3DRENDER_RENDER_QFRAMEGRAPHNODECREATEDCHANGE_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 <Qt3DRender/qframegraphnodecreatedchange.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DRender {
-
-class QFrameGraphNode;
-
-class QFrameGraphNodeCreatedChangeBasePrivate : public Qt3DCore::QNodeCreatedChangeBasePrivate
-{
-public:
-    QFrameGraphNodeCreatedChangeBasePrivate(const QFrameGraphNode *node);
-
-    Qt3DCore::QNodeId m_parentFrameGraphNodeId;
-    Qt3DCore::QNodeIdVector m_childFrameGraphNodeIds;
-
-    static QFrameGraphNodeCreatedChangeBasePrivate *get(QFrameGraphNodeCreatedChangeBase *change)
-    {
-        return change->d_func();
-    }
-    static const QFrameGraphNodeCreatedChangeBasePrivate *get(const QFrameGraphNodeCreatedChangeBase *change)
-    {
-        return change->d_func();
-    }
-};
-
-} // Qt3DRender
-
-QT_END_NAMESPACE
-
-#endif // QT3DRENDER_RENDER_QFRAMEGRAPHNODECREATEDCHANGE_P_H
diff --git a/src/render/framegraph/qlayerfilter.cpp b/src/render/framegraph/qlayerfilter.cpp
index 8bad46f5d..50f3eb429 100644
--- a/src/render/framegraph/qlayerfilter.cpp
+++ b/src/render/framegraph/qlayerfilter.cpp
@@ -40,7 +40,6 @@
 #include "qlayerfilter.h"
 #include "qlayerfilter_p.h"
 #include "qlayer.h"
-#include <Qt3DRender/qframegraphnodecreatedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -203,7 +202,7 @@ void QLayerFilter::addLayer(QLayer *layer)
         if (!layer->parent())
             layer->setParent(this);
 
-        d->updateNode(layer, "layer", Qt3DCore::PropertyValueAdded);
+        d->update();
     }
 }
 
@@ -214,7 +213,7 @@ void QLayerFilter::removeLayer(QLayer *layer)
 {
     Q_ASSERT(layer);
     Q_D(QLayerFilter);
-    d->updateNode(layer, "layer", Qt3DCore::PropertyValueRemoved);
+    d->update();
     d->m_layers.removeOne(layer);
     // Remove bookkeeping connection
     d->unregisterDestructionHelper(layer);
@@ -244,16 +243,6 @@ void QLayerFilter::setFilterMode(QLayerFilter::FilterMode filterMode)
     }
 }
 
-Qt3DCore::QNodeCreatedChangeBasePtr QLayerFilter::createNodeCreationChange() const
-{
-    auto creationChange = QFrameGraphNodeCreatedChangePtr<QLayerFilterData>::create(this);
-    auto &data = creationChange->data;
-    Q_D(const QLayerFilter);
-    data.layerIds = qIdsForNodes(d->m_layers);
-    data.filterMode = d->m_filterMode;
-    return creationChange;
-}
-
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/framegraph/qlayerfilter.h b/src/render/framegraph/qlayerfilter.h
index dd628e74e..f430814d5 100644
--- a/src/render/framegraph/qlayerfilter.h
+++ b/src/render/framegraph/qlayerfilter.h
@@ -83,7 +83,6 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QLayerFilter)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/framegraph/qmemorybarrier.cpp b/src/render/framegraph/qmemorybarrier.cpp
index 5da462f1b..1b44fac79 100644
--- a/src/render/framegraph/qmemorybarrier.cpp
+++ b/src/render/framegraph/qmemorybarrier.cpp
@@ -39,7 +39,6 @@
 
 #include "qmemorybarrier.h"
 #include "qmemorybarrier_p.h"
-#include <Qt3DRender/qframegraphnodecreatedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -155,16 +154,6 @@ QMemoryBarrier::QMemoryBarrier(QMemoryBarrierPrivate &dd, Qt3DCore::QNode *paren
 {
 }
 
-Qt3DCore::QNodeCreatedChangeBasePtr QMemoryBarrier::createNodeCreationChange() const
-{
-    auto creationChange = QFrameGraphNodeCreatedChangePtr<QMemoryBarrierData>::create(this);
-    QMemoryBarrierData &data = creationChange->data;
-    Q_D(const QMemoryBarrier);
-    data.waitOperations = d->m_waitOperations;
-    return creationChange;
-}
-
-
 } // Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/framegraph/qmemorybarrier.h b/src/render/framegraph/qmemorybarrier.h
index 29b439700..518b007ab 100644
--- a/src/render/framegraph/qmemorybarrier.h
+++ b/src/render/framegraph/qmemorybarrier.h
@@ -89,7 +89,6 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QMemoryBarrier)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // Qt3DRender
diff --git a/src/render/framegraph/qproximityfilter.cpp b/src/render/framegraph/qproximityfilter.cpp
index cd1ecf776..6836956a4 100644
--- a/src/render/framegraph/qproximityfilter.cpp
+++ b/src/render/framegraph/qproximityfilter.cpp
@@ -40,7 +40,6 @@
 #include "qproximityfilter.h"
 #include "qproximityfilter_p.h"
 #include <Qt3DCore/qentity.h>
-#include <Qt3DRender/qframegraphnodecreatedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -181,16 +180,6 @@ void QProximityFilter::setDistanceThreshold(float distanceThreshold)
     emit distanceThresholdChanged(distanceThreshold);
 }
 
-Qt3DCore::QNodeCreatedChangeBasePtr QProximityFilter::createNodeCreationChange() const
-{
-    auto creationChange = QFrameGraphNodeCreatedChangePtr<QProximityFilterData>::create(this);
-    QProximityFilterData &data = creationChange->data;
-    Q_D(const QProximityFilter);
-    data.entityId = Qt3DCore::qIdForNode(d->m_entity);
-    data.distanceThreshold = d->m_distanceThreshold;
-    return creationChange;
-}
-
 } // Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/framegraph/qproximityfilter.h b/src/render/framegraph/qproximityfilter.h
index 56bcd6eaf..56b48c46f 100644
--- a/src/render/framegraph/qproximityfilter.h
+++ b/src/render/framegraph/qproximityfilter.h
@@ -74,7 +74,6 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QProximityFilter)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/framegraph/qrendercapture.cpp b/src/render/framegraph/qrendercapture.cpp
index a10083374..12afbeee8 100644
--- a/src/render/framegraph/qrendercapture.cpp
+++ b/src/render/framegraph/qrendercapture.cpp
@@ -36,9 +36,6 @@
 
 #include <Qt3DRender/qrendercapture.h>
 #include <Qt3DRender/private/qrendercapture_p.h>
-#include <Qt3DCore/qscenechange.h>
-#include <Qt3DCore/qpropertyupdatedchange.h>
-#include <Qt3DRender/qframegraphnodecreatedchange.h>
 
 #include <QPointer>
 #include <QMutexLocker>
@@ -119,17 +116,6 @@ namespace Qt3DRender {
  * \since 5.9
  */
 
-#if QT_DEPRECATED_SINCE(5, 9)
-/*!
- * \qmlmethod void Qt3D.Render::RenderCaptureReply::saveToFile(fileName)
- * \deprecated
- *
- * Saves the render capture result as an image to \a fileName.
- *
- * Deprecated in 5.9. Use saveImage().
- */
-#endif
-
 /*!
  * \qmlmethod RenderCaptureReply Qt3D.Render::RenderCapture::requestCapture(int captureId)
  * \deprecated
@@ -228,21 +214,6 @@ bool QRenderCaptureReply::saveImage(const QString &fileName) const
     return false;
 }
 
-#if QT_DEPRECATED_SINCE(5, 9)
-/*!
- * \deprecated
- * Saves the render capture result as an image to \a fileName.
- *
- * Deprecated in 5.9. Use saveImage().
- */
-void QRenderCaptureReply::saveToFile(const QString &fileName) const
-{
-    Q_D(const QRenderCaptureReply);
-    if (d->m_complete)
-        d->m_image.save(fileName);
-}
-#endif
-
 /*!
  * \internal
  */
@@ -373,41 +344,6 @@ Qt3DRender::QRenderCaptureReply *QRenderCapture::requestCapture()
     return requestCapture(QRect());
 }
 
-/*!
- * \internal
- */
-void QRenderCapture::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change)
-{
-    Q_D(QRenderCapture);
-    Qt3DCore::QPropertyUpdatedChangePtr propertyChange = qSharedPointerCast<Qt3DCore::QPropertyUpdatedChange>(change);
-    if (propertyChange->type() == Qt3DCore::PropertyUpdated) {
-        if (propertyChange->propertyName() == QByteArrayLiteral("renderCaptureData")) {
-            RenderCaptureDataPtr data = propertyChange->value().value<RenderCaptureDataPtr>();
-            QPointer<QRenderCaptureReply> reply = d->takeReply(data.data()->captureId);
-            if (reply) {
-                d->setImage(reply, data.data()->image);
-                emit reply->completed();
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-                if (reply)
-                    emit reply->completeChanged(true);
-QT_WARNING_POP
-            }
-        }
-    }
-}
-
-/*!
- * \internal
- */
-Qt3DCore::QNodeCreatedChangeBasePtr QRenderCapture::createNodeCreationChange() const
-{
-    auto creationChange = QFrameGraphNodeCreatedChangePtr<QRenderCaptureInitData>::create(this);
-    QRenderCaptureInitData &data = creationChange->data;
-    data.captureId = 0;
-    return creationChange;
-}
-
 } // Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/framegraph/qrendercapture.h b/src/render/framegraph/qrendercapture.h
index 8fa5d0455..890dfd409 100644
--- a/src/render/framegraph/qrendercapture.h
+++ b/src/render/framegraph/qrendercapture.h
@@ -61,13 +61,8 @@ public:
     bool isComplete() const;
 
     Q_INVOKABLE bool saveImage(const QString &fileName) const;
-#if QT_DEPRECATED_SINCE(5, 9)
-    // ### Qt 6: remove this
-    Q_DECL_DEPRECATED_X("Use saveImage instead") Q_INVOKABLE void saveToFile(const QString &fileName) const;
-#endif
 
 Q_SIGNALS:
-    Q_DECL_DEPRECATED_X("Use completed instead") void completeChanged(bool isComplete);
     void completed();
 
 private:
@@ -84,17 +79,12 @@ class Q_3DRENDERSHARED_EXPORT QRenderCapture : public QFrameGraphNode
 public:
     explicit QRenderCapture(Qt3DCore::QNode *parent = nullptr);
 
-    Q_INVOKABLE Q_DECL_DEPRECATED_X("Use the overload with no id parameter")
     Qt3DRender::QRenderCaptureReply *requestCapture(int captureId);
     Q_REVISION(9) Q_INVOKABLE Qt3DRender::QRenderCaptureReply *requestCapture();
     Q_REVISION(10) Q_INVOKABLE Qt3DRender::QRenderCaptureReply *requestCapture(const QRect &rect);
 
-protected:
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override;
-
 private:
     Q_DECLARE_PRIVATE(QRenderCapture)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // Qt3DRender
diff --git a/src/render/framegraph/qrenderpassfilter.cpp b/src/render/framegraph/qrenderpassfilter.cpp
index 952657eb6..dc6cefd00 100644
--- a/src/render/framegraph/qrenderpassfilter.cpp
+++ b/src/render/framegraph/qrenderpassfilter.cpp
@@ -42,7 +42,6 @@
 
 #include <Qt3DRender/qfilterkey.h>
 #include <Qt3DRender/qparameter.h>
-#include <Qt3DRender/qframegraphnodecreatedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -139,7 +138,7 @@ void QRenderPassFilter::addMatch(QFilterKey *filterKey)
         if (!filterKey->parent())
             filterKey->setParent(this);
 
-        d->updateNode(filterKey, "match", Qt3DCore::PropertyValueAdded);
+        d->update();
     }
 }
 
@@ -151,7 +150,7 @@ void QRenderPassFilter::removeMatch(QFilterKey *filterKey)
     Q_ASSERT(filterKey);
     Q_D(QRenderPassFilter);
 
-    d->updateNode(filterKey, "match", Qt3DCore::PropertyValueRemoved);
+    d->update();
     d->m_matchList.removeOne(filterKey);
     // Remove bookkeeping connection
     d->unregisterDestructionHelper(filterKey);
@@ -177,7 +176,7 @@ void QRenderPassFilter::addParameter(QParameter *parameter)
         if (!parameter->parent())
             parameter->setParent(this);
 
-        d->updateNode(parameter, "parameter", Qt3DCore::PropertyValueAdded);
+        d->update();
     }
 }
 
@@ -189,7 +188,7 @@ void QRenderPassFilter::removeParameter(QParameter *parameter)
     Q_ASSERT(parameter);
     Q_D(QRenderPassFilter);
 
-    d->updateNode(parameter, "parameter", Qt3DCore::PropertyValueRemoved);
+    d->update();
     d->m_parameters.removeOne(parameter);
     // Remove bookkeeping connection
     d->unregisterDestructionHelper(parameter);
@@ -204,16 +203,6 @@ QVector<QParameter *> QRenderPassFilter::parameters() const
     return d->m_parameters;
 }
 
-Qt3DCore::QNodeCreatedChangeBasePtr QRenderPassFilter::createNodeCreationChange() const
-{
-    auto creationChange = QFrameGraphNodeCreatedChangePtr<QRenderPassFilterData>::create(this);
-    auto &data = creationChange->data;
-    Q_D(const QRenderPassFilter);
-    data.matchIds = qIdsForNodes(d->m_matchList);
-    data.parameterIds = qIdsForNodes(d->m_parameters);
-    return creationChange;
-}
-
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/framegraph/qrenderpassfilter.h b/src/render/framegraph/qrenderpassfilter.h
index 9fb11757f..49a9e1d3e 100644
--- a/src/render/framegraph/qrenderpassfilter.h
+++ b/src/render/framegraph/qrenderpassfilter.h
@@ -74,7 +74,6 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QRenderPassFilter)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/framegraph/qrenderstateset.cpp b/src/render/framegraph/qrenderstateset.cpp
index 5341b3c7d..2b701e67e 100644
--- a/src/render/framegraph/qrenderstateset.cpp
+++ b/src/render/framegraph/qrenderstateset.cpp
@@ -41,7 +41,6 @@
 #include "qrenderstateset_p.h"
 
 #include <Qt3DRender/qrenderstate.h>
-#include <Qt3DRender/qframegraphnodecreatedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -191,7 +190,7 @@ void QRenderStateSet::addRenderState(QRenderState *state)
         if (!state->parent())
             state->setParent(this);
 
-        d->updateNode(state, "renderState", Qt3DCore::PropertyValueAdded);
+        d->update();
     }
 }
 
@@ -203,7 +202,7 @@ void QRenderStateSet::removeRenderState(QRenderState *state)
     Q_ASSERT(state);
     Q_D(QRenderStateSet);
 
-    d->updateNode(state, "renderState", Qt3DCore::PropertyValueRemoved);
+    d->update();
     d->m_renderStates.removeOne(state);
     // Remove bookkeeping connection
     d->unregisterDestructionHelper(state);
@@ -218,15 +217,6 @@ QVector<QRenderState *> QRenderStateSet::renderStates() const
     return d->m_renderStates;
 }
 
-Qt3DCore::QNodeCreatedChangeBasePtr QRenderStateSet::createNodeCreationChange() const
-{
-    auto creationChange = QFrameGraphNodeCreatedChangePtr<QRenderStateSetData>::create(this);
-    auto &data = creationChange->data;
-    Q_D(const QRenderStateSet);
-    data.renderStateIds = qIdsForNodes(d->m_renderStates);
-    return creationChange;
-}
-
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/framegraph/qrenderstateset.h b/src/render/framegraph/qrenderstateset.h
index b08da1ff5..cf4c0cdd5 100644
--- a/src/render/framegraph/qrenderstateset.h
+++ b/src/render/framegraph/qrenderstateset.h
@@ -66,7 +66,6 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QRenderStateSet)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/framegraph/qrendersurfaceselector.cpp b/src/render/framegraph/qrendersurfaceselector.cpp
index df30663cb..3b8eb0ae8 100644
--- a/src/render/framegraph/qrendersurfaceselector.cpp
+++ b/src/render/framegraph/qrendersurfaceselector.cpp
@@ -45,7 +45,6 @@
 #include <QtGui/QOffscreenSurface>
 #include <Qt3DCore/qentity.h>
 #include <Qt3DRender/qrendersettings.h>
-#include <Qt3DRender/qframegraphnodecreatedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -315,17 +314,6 @@ void QRenderSurfaceSelector::setExternalRenderTargetSize(const QSize &size)
     }
 }
 
-Qt3DCore::QNodeCreatedChangeBasePtr QRenderSurfaceSelector::createNodeCreationChange() const
-{
-    auto creationChange = QFrameGraphNodeCreatedChangePtr<QRenderSurfaceSelectorData>::create(this);
-    auto &data = creationChange->data;
-    Q_D(const QRenderSurfaceSelector);
-    data.surface = QPointer<QObject>(surface());
-    data.externalRenderTargetSize = d->m_externalRenderTargetSize;
-    data.surfacePixelRatio = d->m_surfacePixelRatio;
-    return creationChange;
-}
-
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/framegraph/qrendersurfaceselector.h b/src/render/framegraph/qrendersurfaceselector.h
index 73d513311..8af7e1d5a 100644
--- a/src/render/framegraph/qrendersurfaceselector.h
+++ b/src/render/framegraph/qrendersurfaceselector.h
@@ -81,9 +81,6 @@ Q_SIGNALS:
 protected:
     Q_DECLARE_PRIVATE(QRenderSurfaceSelector)
     explicit QRenderSurfaceSelector(QRenderSurfaceSelectorPrivate &dd, Qt3DCore::QNode *parent = nullptr);
-
-private:
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/framegraph/qrendertargetselector.cpp b/src/render/framegraph/qrendertargetselector.cpp
index c997c23cc..b2c8468f2 100644
--- a/src/render/framegraph/qrendertargetselector.cpp
+++ b/src/render/framegraph/qrendertargetselector.cpp
@@ -41,7 +41,6 @@
 #include "qrendertargetselector_p.h"
 #include <Qt3DRender/qrendertarget.h>
 #include <Qt3DRender/private/qrenderpass_p.h>
-#include <Qt3DRender/qframegraphnodecreatedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -171,16 +170,6 @@ QRenderTargetSelector::QRenderTargetSelector(QRenderTargetSelectorPrivate &dd, Q
 {
 }
 
-Qt3DCore::QNodeCreatedChangeBasePtr QRenderTargetSelector::createNodeCreationChange() const
-{
-    auto creationChange = QFrameGraphNodeCreatedChangePtr<QRenderTargetSelectorData>::create(this);
-    auto &data = creationChange->data;
-    Q_D(const QRenderTargetSelector);
-    data.targetId = qIdForNode(d->m_target);
-    data.outputs = d->m_outputs;
-    return creationChange;
-}
-
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/framegraph/qrendertargetselector.h b/src/render/framegraph/qrendertargetselector.h
index c6b7b641d..cb6c679ff 100644
--- a/src/render/framegraph/qrendertargetselector.h
+++ b/src/render/framegraph/qrendertargetselector.h
@@ -76,7 +76,6 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QRenderTargetSelector)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/framegraph/qsetfence.cpp b/src/render/framegraph/qsetfence.cpp
index 262dbd4ad..ae25ba80f 100644
--- a/src/render/framegraph/qsetfence.cpp
+++ b/src/render/framegraph/qsetfence.cpp
@@ -39,8 +39,6 @@
 
 #include "qsetfence.h"
 #include "qsetfence_p.h"
-#include <Qt3DRender/private/qframegraphnodecreatedchange_p.h>
-#include <Qt3DCore/qpropertyupdatedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -150,26 +148,6 @@ void QSetFencePrivate::setHandle(QVariant handle)
     }
 }
 
-void QSetFence::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change)
-{
-    Qt3DCore::QPropertyUpdatedChangePtr e = qSharedPointerCast<Qt3DCore::QPropertyUpdatedChange>(change);
-    if (e->type() == Qt3DCore::PropertyUpdated) {
-        Q_D(QSetFence);
-        if (e->propertyName() == QByteArrayLiteral("handle"))
-            d->setHandle(e->value());
-        else if (e->propertyName() == QByteArrayLiteral("handleType"))
-            d->setHandleType(static_cast<Qt3DRender::QSetFence::HandleType>(e->value().toInt()));
-    }
-}
-
-Qt3DCore::QNodeCreatedChangeBasePtr QSetFence::createNodeCreationChange() const
-{
-    auto creationChange = QFrameGraphNodeCreatedChangePtr<QSetFenceData>::create(this);
-    QSetFenceData &data = creationChange->data;
-    Q_UNUSED(data); // Might be of use later
-    return creationChange;
-}
-
 } // Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/framegraph/qsetfence.h b/src/render/framegraph/qsetfence.h
index 4ad92ae52..8747a0e02 100644
--- a/src/render/framegraph/qsetfence.h
+++ b/src/render/framegraph/qsetfence.h
@@ -72,11 +72,9 @@ Q_SIGNALS:
 
 protected:
    explicit QSetFence(QSetFencePrivate &dd, Qt3DCore::QNode *parent = nullptr);
-   void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override;
 
 private:
     Q_DECLARE_PRIVATE(QSetFence)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // Qt3DRender
diff --git a/src/render/framegraph/qsetfence_p.h b/src/render/framegraph/qsetfence_p.h
index 026afffa5..2a929bde6 100644
--- a/src/render/framegraph/qsetfence_p.h
+++ b/src/render/framegraph/qsetfence_p.h
@@ -53,12 +53,13 @@
 
 #include <Qt3DRender/private/qframegraphnode_p.h>
 #include <Qt3DRender/qsetfence.h>
+#include <Qt3DRender/private/qt3drender_global_p.h>
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QSetFencePrivate : public QFrameGraphNodePrivate
+class Q_3DRENDERSHARED_PRIVATE_EXPORT QSetFencePrivate : public QFrameGraphNodePrivate
 {
 public:
     QSetFencePrivate();
diff --git a/src/render/framegraph/qsortpolicy.cpp b/src/render/framegraph/qsortpolicy.cpp
index 5c04025b0..a107f1906 100644
--- a/src/render/framegraph/qsortpolicy.cpp
+++ b/src/render/framegraph/qsortpolicy.cpp
@@ -38,9 +38,6 @@
 ****************************************************************************/
 
 #include "qsortpolicy_p.h"
-#include <Qt3DCore/qpropertyvalueaddedchange.h>
-#include <Qt3DCore/qpropertyvalueremovedchange.h>
-#include <Qt3DRender/qframegraphnodecreatedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -152,15 +149,6 @@ QSortPolicy::QSortPolicy(QSortPolicyPrivate &dd, QNode *parent)
 {
 }
 
-QNodeCreatedChangeBasePtr QSortPolicy::createNodeCreationChange() const
-{
-    auto creationChange = QFrameGraphNodeCreatedChangePtr<QSortPolicyData>::create(this);
-    QSortPolicyData &data = creationChange->data;
-    Q_D(const QSortPolicy);
-    data.sortTypes = d->m_sortTypes;
-    return creationChange;
-}
-
 /*!
     \return the current sort types in use
  */
diff --git a/src/render/framegraph/qsortpolicy.h b/src/render/framegraph/qsortpolicy.h
index f5ea988e8..5cd1ef7e2 100644
--- a/src/render/framegraph/qsortpolicy.h
+++ b/src/render/framegraph/qsortpolicy.h
@@ -82,7 +82,6 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QSortPolicy)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/framegraph/qsubtreeenabler.cpp b/src/render/framegraph/qsubtreeenabler.cpp
index e5d182d00..d37cc37e8 100644
--- a/src/render/framegraph/qsubtreeenabler.cpp
+++ b/src/render/framegraph/qsubtreeenabler.cpp
@@ -38,7 +38,6 @@
 ****************************************************************************/
 
 #include "qsubtreeenabler_p.h"
-#include <Qt3DRender/qframegraphnodecreatedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -171,15 +170,6 @@ void QSubtreeEnabler::requestUpdate()
     setEnabled(true);
 }
 
-Qt3DCore::QNodeCreatedChangeBasePtr QSubtreeEnabler::createNodeCreationChange() const
-{
-    auto creationChange = QFrameGraphNodeCreatedChangePtr<QSubtreeEnablerData>::create(this);
-    auto &data = creationChange->data;
-    Q_D(const QSubtreeEnabler);
-    data.enablement = d->m_enablement;
-    return creationChange;
-}
-
 } //Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/framegraph/qsubtreeenabler.h b/src/render/framegraph/qsubtreeenabler.h
index 558e3b8b7..a34bb7aa8 100644
--- a/src/render/framegraph/qsubtreeenabler.h
+++ b/src/render/framegraph/qsubtreeenabler.h
@@ -73,7 +73,6 @@ Q_SIGNALS:
 
 private:
     Q_DECLARE_PRIVATE(QSubtreeEnabler)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } //Qt3DRender
diff --git a/src/render/framegraph/qtechniquefilter.cpp b/src/render/framegraph/qtechniquefilter.cpp
index c22e83381..d00d04da9 100644
--- a/src/render/framegraph/qtechniquefilter.cpp
+++ b/src/render/framegraph/qtechniquefilter.cpp
@@ -41,7 +41,6 @@
 #include "qtechniquefilter_p.h"
 #include <Qt3DRender/qfilterkey.h>
 #include <Qt3DRender/qparameter.h>
-#include <Qt3DRender/qframegraphnodecreatedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -144,7 +143,7 @@ void QTechniqueFilter::addMatch(QFilterKey *filterKey)
         if (!filterKey->parent())
             filterKey->setParent(this);
 
-        d->updateNode(filterKey, "matchAll", Qt3DCore::PropertyValueAdded);
+        d->update();
     }
 }
 
@@ -155,7 +154,7 @@ void QTechniqueFilter::removeMatch(QFilterKey *filterKey)
 {
     Q_ASSERT(filterKey);
     Q_D(QTechniqueFilter);
-    d->updateNode(filterKey, "matchAll", Qt3DCore::PropertyValueRemoved);
+    d->update();
     d->m_matchList.removeOne(filterKey);
     // Remove bookkeeping connection
     d->unregisterDestructionHelper(filterKey);
@@ -181,7 +180,7 @@ void QTechniqueFilter::addParameter(QParameter *parameter)
         if (!parameter->parent())
             parameter->setParent(this);
 
-        d->updateNode(parameter, "parameter", Qt3DCore::PropertyValueAdded);
+        d->update();
     }
 }
 
@@ -192,7 +191,7 @@ void QTechniqueFilter::removeParameter(QParameter *parameter)
 {
     Q_ASSERT(parameter);
     Q_D(QTechniqueFilter);
-    d->updateNode(parameter, "parameter", Qt3DCore::PropertyValueRemoved);
+    d->update();
     d->m_parameters.removeOne(parameter);
     // Remove bookkeeping connection
     d->unregisterDestructionHelper(parameter);
@@ -207,16 +206,6 @@ QVector<QParameter *> QTechniqueFilter::parameters() const
     return d->m_parameters;
 }
 
-Qt3DCore::QNodeCreatedChangeBasePtr QTechniqueFilter::createNodeCreationChange() const
-{
-    auto creationChange = QFrameGraphNodeCreatedChangePtr<QTechniqueFilterData>::create(this);
-    auto &data = creationChange->data;
-    Q_D(const QTechniqueFilter);
-    data.matchIds = qIdsForNodes(d->m_matchList);
-    data.parameterIds = qIdsForNodes(d->m_parameters);
-    return creationChange;
-}
-
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/framegraph/qtechniquefilter.h b/src/render/framegraph/qtechniquefilter.h
index 9fe872915..1cf9abcd1 100644
--- a/src/render/framegraph/qtechniquefilter.h
+++ b/src/render/framegraph/qtechniquefilter.h
@@ -71,7 +71,6 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QTechniqueFilter)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/framegraph/qviewport.cpp b/src/render/framegraph/qviewport.cpp
index 34716c5b5..fa04c647a 100644
--- a/src/render/framegraph/qviewport.cpp
+++ b/src/render/framegraph/qviewport.cpp
@@ -40,8 +40,6 @@
 #include "qviewport.h"
 #include "qviewport_p.h"
 
-#include <Qt3DRender/qframegraphnodecreatedchange.h>
-
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
@@ -155,16 +153,6 @@ void QViewport::setGamma(float gamma)
     }
 }
 
-Qt3DCore::QNodeCreatedChangeBasePtr QViewport::createNodeCreationChange() const
-{
-    auto creationChange = QFrameGraphNodeCreatedChangePtr<QViewportData>::create(this);
-    auto &data = creationChange->data;
-    Q_D(const QViewport);
-    data.normalizedRect = d->m_normalizedRect;
-    data.gamma = d->m_gamma;
-    return creationChange;
-}
-
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/framegraph/qviewport.h b/src/render/framegraph/qviewport.h
index 01830be6a..bcff1dd1b 100644
--- a/src/render/framegraph/qviewport.h
+++ b/src/render/framegraph/qviewport.h
@@ -76,7 +76,6 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QViewport)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/framegraph/qwaitfence.cpp b/src/render/framegraph/qwaitfence.cpp
index 737f4e54d..4cd1bea61 100644
--- a/src/render/framegraph/qwaitfence.cpp
+++ b/src/render/framegraph/qwaitfence.cpp
@@ -40,7 +40,6 @@
 #include "qwaitfence.h"
 #include "qwaitfence_p.h"
 #include <Qt3DRender/private/qframegraphnode_p.h>
-#include <Qt3DRender/private/qframegraphnodecreatedchange_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -202,18 +201,6 @@ void QWaitFence::setHandle(QVariant handle)
     }
 }
 
-Qt3DCore::QNodeCreatedChangeBasePtr QWaitFence::createNodeCreationChange() const
-{
-    auto creationChange = QFrameGraphNodeCreatedChangePtr<QWaitFenceData>::create(this);
-    QWaitFenceData &data = creationChange->data;
-    Q_D(const QWaitFence);
-    data.handleType = d->m_handleType;
-    data.handle = d->m_handle;
-    data.timeout = d->m_timeout;
-    data.waitOnCPU = d->m_waitOnCPU;
-    return creationChange;
-}
-
 } // Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/framegraph/qwaitfence.h b/src/render/framegraph/qwaitfence.h
index 8148fde7d..bae5981db 100644
--- a/src/render/framegraph/qwaitfence.h
+++ b/src/render/framegraph/qwaitfence.h
@@ -88,7 +88,6 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QWaitFence)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // Qt3DRender
diff --git a/src/render/framegraph/rendercapture.cpp b/src/render/framegraph/rendercapture.cpp
index 73d8770a7..4d8ad0591 100644
--- a/src/render/framegraph/rendercapture.cpp
+++ b/src/render/framegraph/rendercapture.cpp
@@ -36,7 +36,6 @@
 
 #include <Qt3DRender/private/qrendercapture_p.h>
 #include <Qt3DRender/private/rendercapture_p.h>
-#include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/private/qaspectmanager_p.h>
 #include <Qt3DCore/private/qaspectjobmanager_p.h>
 
@@ -115,10 +114,6 @@ void RenderCapture::syncRenderCapturesToFrontend(Qt3DCore::QAspectManager *manag
         if (reply) {
             dfrontend->setImage(reply, data.data()->image);
             emit reply->completed();
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-            emit reply->completeChanged(true);
-QT_WARNING_POP
         }
     }
     m_renderCaptureData.clear();
diff --git a/src/render/framegraph/setfence.cpp b/src/render/framegraph/setfence.cpp
index e0a0d8578..b2b772cb9 100644
--- a/src/render/framegraph/setfence.cpp
+++ b/src/render/framegraph/setfence.cpp
@@ -38,7 +38,6 @@
 ****************************************************************************/
 
 #include "setfence_p.h"
-#include <Qt3DCore/qpropertyupdatedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -55,24 +54,6 @@ SetFence::~SetFence()
 {
 }
 
-void SetFence::setHandle(const QVariant &handle)
-{
-    auto change = Qt3DCore::QPropertyUpdatedChangePtr::create(peerId());
-    change->setDeliveryFlags(Qt3DCore::QSceneChange::Nodes);
-    change->setPropertyName("handle");
-    change->setValue(handle);
-    notifyObservers(change);
-}
-
-void SetFence::setHandleType(QSetFence::HandleType type)
-{
-    auto change = Qt3DCore::QPropertyUpdatedChangePtr::create(peerId());
-    change->setDeliveryFlags(Qt3DCore::QSceneChange::Nodes);
-    change->setPropertyName("handleType");
-    change->setValue(QVariant::fromValue(type));
-    notifyObservers(change);
-}
-
 } // namespace Render
 
 } // namespace Qt3DRender
diff --git a/src/render/framegraph/setfence_p.h b/src/render/framegraph/setfence_p.h
index 0f54d65ee..6d874e523 100644
--- a/src/render/framegraph/setfence_p.h
+++ b/src/render/framegraph/setfence_p.h
@@ -65,10 +65,6 @@ class Q_3DRENDERSHARED_PRIVATE_EXPORT SetFence : public FrameGraphNode
 public:
     SetFence();
     ~SetFence();
-
-    // Called by a job
-    void setHandle(const QVariant &handle);
-    void setHandleType(QSetFence::HandleType type);
 };
 
 } // namespace Render
diff --git a/src/render/framegraph/statesetnode.cpp b/src/render/framegraph/statesetnode.cpp
index c494c572b..b3d8a95bb 100644
--- a/src/render/framegraph/statesetnode.cpp
+++ b/src/render/framegraph/statesetnode.cpp
@@ -43,6 +43,7 @@
 #include <Qt3DRender/private/qrenderstateset_p.h>
 #include <Qt3DRender/private/genericstate_p.h>
 #include <Qt3DRender/private/renderstateset_p.h>
+#include <Qt3DRender/qrenderstate.h>
 
 QT_BEGIN_NAMESPACE