1 files changed, 4 insertions, 62 deletions
diff --git a/tests/auto/render/qrendercapture/tst_qrendercapture.cpp b/tests/auto/render/qrendercapture/tst_qrendercapture.cpp
index 35c645d41..2b4fcec6b 100644
--- a/tests/auto/render/qrendercapture/tst_qrendercapture.cpp
+++ b/tests/auto/render/qrendercapture/tst_qrendercapture.cpp
@@ -26,13 +26,8 @@
 **
 ****************************************************************************/
 
-// TODO Remove in Qt6
-#include <QtCore/qcompilerdetection.h>
-QT_WARNING_DISABLE_DEPRECATED
-
 #include <QtTest/QTest>
 #include <QtTest/QSignalSpy>
-#include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/private/qnode_p.h>
 #include <Qt3DCore/private/qscene_p.h>
 #include <Qt3DRender/QRenderCapture>
@@ -40,7 +35,7 @@ QT_WARNING_DISABLE_DEPRECATED
 
 #include <QPointer>
 
-#include "testpostmanarbiter.h"
+#include "testarbiter.h"
 
 class MyRenderCapture : public Qt3DRender::QRenderCapture
 {
@@ -50,11 +45,6 @@ public:
         : Qt3DRender::QRenderCapture(parent)
     {}
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) final
-    {
-        Qt3DRender::QRenderCapture::sceneChangeEvent(change);
-    }
-
 private:
     friend class tst_QRenderCapture;
 };
@@ -76,58 +66,10 @@ private Q_SLOTS:
         QScopedPointer<Qt3DRender::QRenderCaptureReply> reply(renderCapture->requestCapture(QRect(10, 15, 20, 50)));
 
         // THEN
-        QCOMPARE(arbiter.events.size(), 0);
-        QCOMPARE(arbiter.dirtyNodes.size(), 1);
-        QCOMPARE(arbiter.dirtyNodes.front(), renderCapture.data());
-
-        arbiter.dirtyNodes.clear();
-    }
-
-    void checkRenderCaptureReply()
-    {
-        // GIVEN
-        QScopedPointer<MyRenderCapture> renderCapture(new MyRenderCapture());
-        QScopedPointer<Qt3DRender::QRenderCaptureReply> reply(renderCapture->requestCapture());
-        QImage img = QImage(20, 20, QImage::Format_ARGB32);
-
-        // WHEN
-        Qt3DRender::RenderCaptureDataPtr data = Qt3DRender::RenderCaptureDataPtr::create();
-        data.data()->captureId = 2;
-        data.data()->image = img;
-
-        auto e = Qt3DCore::QPropertyUpdatedChangePtr::create(renderCapture->id());
-        e->setDeliveryFlags(Qt3DCore::QSceneChange::DeliverToAll);
-        e->setPropertyName("renderCaptureData");
-        e->setValue(QVariant::fromValue(data));
-
-        renderCapture->sceneChangeEvent(e);
-
-        // THEN
-        QCOMPARE(reply->isComplete(), true);
-        QCOMPARE(reply->image().width(), 20);
-        QCOMPARE(reply->image().height(), 20);
-        QCOMPARE(reply->image().format(), QImage::Format_ARGB32);
-    }
+        QCOMPARE(arbiter.dirtyNodes().size(), 1);
+        QCOMPARE(arbiter.dirtyNodes().front(), renderCapture.data());
 
-    void checkRenderCaptureDestroy()
-    {
-        // GIVEN
-        QScopedPointer<MyRenderCapture> renderCapture(new MyRenderCapture());
-        QScopedPointer<Qt3DRender::QRenderCaptureReply> reply(renderCapture->requestCapture());
-        QImage img = QImage(20, 20, QImage::Format_ARGB32);
-        Qt3DRender::RenderCaptureDataPtr data = Qt3DRender::RenderCaptureDataPtr::create();
-        data.data()->captureId = 2;
-        data.data()->image = img;
-        auto e = Qt3DCore::QPropertyUpdatedChangePtr::create(renderCapture->id());
-        e->setDeliveryFlags(Qt3DCore::QSceneChange::DeliverToAll);
-        e->setPropertyName("renderCaptureData");
-        e->setValue(QVariant::fromValue(data));
-
-        // WHEN
-        reply.reset();
-
-        // THEN
-        renderCapture->sceneChangeEvent(e); // Should not reset
+        arbiter.clear();
     }
 
     void crashOnRenderCaptureDeletion()