Fix deprecation handling

Change-Id: If981333f7a3d78028d4f08c59867453d4192b955
Task-number: QTBUG-81058
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

19 files changed, 70 insertions, 226 deletions

diff --git a/tests/auto/animation/animationutils/tst_animationutils.cpp b/tests/auto/animation/animationutils/tst_animationutils.cpp
index 463656557..05558192d 100644
--- a/tests/auto/animation/animationutils/tst_animationutils.cpp
+++ b/tests/auto/animation/animationutils/tst_animationutils.cpp
@@ -38,7 +38,6 @@
 #include <Qt3DAnimation/private/additiveclipblend_p.h>
 #include <Qt3DAnimation/private/lerpclipblend_p.h>
 #include <Qt3DAnimation/private/managers_p.h>
-#include <Qt3DCore/qpropertyupdatedchange.h>
 #include <QtGui/qvector2d.h>
 #include <QtGui/qvector3d.h>
 #include <QtGui/qvector4d.h>
@@ -57,7 +56,6 @@ Q_DECLARE_METATYPE(Clock *)
 Q_DECLARE_METATYPE(ChannelMapper *)
 Q_DECLARE_METATYPE(AnimationClip *)
 Q_DECLARE_METATYPE(QVector<MappingData>)
-Q_DECLARE_METATYPE(QVector<Qt3DCore::QPropertyUpdatedChangePtr>)
 Q_DECLARE_METATYPE(Channel)
 Q_DECLARE_METATYPE(AnimatorEvaluationData)
 Q_DECLARE_METATYPE(ClipEvaluationData)
diff --git a/tests/auto/core/common/qbackendnodetester.cpp b/tests/auto/core/common/qbackendnodetester.cpp
index a2685f556..13f4683d9 100644
--- a/tests/auto/core/common/qbackendnodetester.cpp
+++ b/tests/auto/core/common/qbackendnodetester.cpp
@@ -56,20 +56,29 @@ void QBackendNodeTester::simulateInitialization(QNode *frontend, QBackendNode *b
 {
     Q_ASSERT(frontend);
     Q_ASSERT(backend);
+    QT_WARNING_PUSH
+    QT_WARNING_DISABLE_DEPRECATED
     const auto change = frontend->createNodeCreationChange();
     backend->setPeerId(change->subjectId());
     backend->setEnabled(change->isNodeEnabled());
     backend->initializeFromPeer(change);
+    QT_WARNING_POP
 }
 
 void QBackendNodeTester::sceneChangeEvent(QBackendNode *backend, const Qt3DCore::QSceneChangePtr &e)
 {
+    QT_WARNING_PUSH
+    QT_WARNING_DISABLE_DEPRECATED
     backend->sceneChangeEvent(e);
+    QT_WARNING_POP
 }
 
 QNodeCreatedChangeBasePtr QBackendNodeTester::creationChange(QNode *frontend) const
 {
+    QT_WARNING_PUSH
+    QT_WARNING_DISABLE_DEPRECATED
     return frontend->createNodeCreationChange();
+    QT_WARNING_POP
 }
 
 } // namespace Qt3DCore
diff --git a/tests/auto/core/common/testpostmanarbiter.cpp b/tests/auto/core/common/testpostmanarbiter.cpp
index 5869cbad3..f0c362744 100644
--- a/tests/auto/core/common/testpostmanarbiter.cpp
+++ b/tests/auto/core/common/testpostmanarbiter.cpp
@@ -26,6 +26,10 @@
 **
 ****************************************************************************/
 
+// TODO Remove in Qt6
+#include <QtCore/qcompilerdetection.h>
+QT_WARNING_DISABLE_DEPRECATED
+
 #include "testpostmanarbiter.h"
 #include <Qt3DCore/private/qnode_p.h>
 
diff --git a/tests/auto/core/common/testpostmanarbiter.h b/tests/auto/core/common/testpostmanarbiter.h
index cecc24f93..e927c2489 100644
--- a/tests/auto/core/common/testpostmanarbiter.h
+++ b/tests/auto/core/common/testpostmanarbiter.h
@@ -70,7 +70,10 @@ public:
 
     void setArbiterOnNode(Qt3DCore::QNode *node);
     void addDirtyFrontEndNode(Qt3DCore::QNode *node) final;
+    QT_WARNING_PUSH
+    QT_WARNING_DISABLE_DEPRECATED
     void addDirtyFrontEndNode(Qt3DCore::QNode *node, Qt3DCore::QNode *subNode, const char *property, Qt3DCore::ChangeFlag change) final;
+    QT_WARNING_POP
     void removeDirtyFrontEndNode(Qt3DCore::QNode *node) final;
 
 private:
diff --git a/tests/auto/core/nodes/tst_nodes.cpp b/tests/auto/core/nodes/tst_nodes.cpp
index 87f66bab2..2e74acd61 100644
--- a/tests/auto/core/nodes/tst_nodes.cpp
+++ b/tests/auto/core/nodes/tst_nodes.cpp
@@ -26,6 +26,10 @@
 **
 ****************************************************************************/
 
+// TODO Remove in Qt6
+#include <QtCore/qcompilerdetection.h>
+QT_WARNING_DISABLE_DEPRECATED
+
 #include <QtTest/QTest>
 #include <Qt3DCore/qnode.h>
 #include <Qt3DCore/qentity.h>
diff --git a/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp b/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp
index e54193398..3e9b24408 100644
--- a/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp
+++ b/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp
@@ -26,6 +26,10 @@
 **
 ****************************************************************************/
 
+// TODO Remove in Qt6
+#include <QtCore/qcompilerdetection.h>
+QT_WARNING_DISABLE_DEPRECATED
+
 #include <QtTest/QTest>
 #include <Qt3DCore/private/qobserverinterface_p.h>
 #include <Qt3DCore/private/qobservableinterface_p.h>
diff --git a/tests/auto/core/qentity/tst_qentity.cpp b/tests/auto/core/qentity/tst_qentity.cpp
index 7770a2632..7b41c9783 100644
--- a/tests/auto/core/qentity/tst_qentity.cpp
+++ b/tests/auto/core/qentity/tst_qentity.cpp
@@ -26,6 +26,10 @@
 **
 ****************************************************************************/
 
+// TODO Remove in Qt6
+#include <QtCore/qcompilerdetection.h>
+QT_WARNING_DISABLE_DEPRECATED
+
 #include <QtTest/QtTest>
 #include <Qt3DCore/qentity.h>
 #include <Qt3DCore/private/qentity_p.h>
diff --git a/tests/auto/core/qpostman/tst_qpostman.cpp b/tests/auto/core/qpostman/tst_qpostman.cpp
index f548d38fa..d0dfa0f49 100644
--- a/tests/auto/core/qpostman/tst_qpostman.cpp
+++ b/tests/auto/core/qpostman/tst_qpostman.cpp
@@ -86,227 +86,6 @@ private Q_SLOTS:
         QCOMPARE(QPostmanPrivate::get(&postman)->m_scene, &scene);
     }
 
-    void checkSceneChangeEvent()
-    {
-        // GIVEN
-        QScopedPointer<QScene> scene(new QScene);
-        QPostman postman;
-        TestArbiter arbiter;
-        QNode rootNode;
-        NodeChangeReceiver *receiverNode = new NodeChangeReceiver();
-
-        QNodePrivate::get(&rootNode)->m_scene = scene.data();
-        scene->setArbiter(&arbiter);
-        postman.setScene(scene.data());
-        // Setting the parent (which has a scene) adds the node into the observable lookup
-        // table of the scene which is needed by the postman to distribute changes
-        static_cast<QNode *>(receiverNode)->setParent(&rootNode);
-        QCoreApplication::processEvents();
-
-        // THEN
-        QCOMPARE(receiverNode->hasReceivedChange(), false);
-        QCOMPARE(QNodePrivate::get(receiverNode)->m_scene, scene.data());
-
-        // WHEN
-        QPropertyUpdatedChangePtr updateChange(new QPropertyUpdatedChange(receiverNode->id()));
-        updateChange->setValue(1584);
-        updateChange->setPropertyName("someName");
-        postman.sceneChangeEvent(updateChange);
-        QCoreApplication::processEvents();
-
-        // THEN
-        QCOMPARE(receiverNode->hasReceivedChange(), true);
-    }
-
-    void checkNotifyBackend()
-    {
-        // GIVEN
-        QScopedPointer<QScene> scene(new QScene);
-        QPostman postman;
-        TestArbiter arbiter;
-
-        scene->setArbiter(&arbiter);
-        postman.setScene(scene.data());
-
-        // THEN
-        QCOMPARE(arbiter.events.size(), 0);
-
-        // WHEN
-        QPropertyUpdatedChangePtr updateChange(new QPropertyUpdatedChange(QNodeId()));
-        updateChange->setValue(1584);
-        updateChange->setPropertyName("someName");
-        postman.notifyBackend(updateChange);
-
-        QCoreApplication::processEvents();
-
-        // THEN
-        QCOMPARE(arbiter.events.size(), 1);
-    }
-
-    void checkShouldNotifyFrontend()
-    {
-        // GIVEN
-        QScopedPointer<QScene> scene(new QScene);
-        QPostman postman;
-        TestArbiter arbiter;
-        QNode rootNode;
-        NodeChangeReceiver *receiverNode = new NodeChangeReceiver();
-
-        QNodePrivate::get(&rootNode)->m_scene = scene.data();
-        scene->setArbiter(&arbiter);
-        postman.setScene(scene.data());
-        // Setting the parent (which has a scene) adds the node into the observable lookup
-        // table of the scene which is needed by the postman to distribute changes
-        static_cast<QNode *>(receiverNode)->setParent(&rootNode);
-        QCoreApplication::processEvents();
-
-        {
-            // WHEN
-            auto updateChange = QPropertyUpdatedChangePtr::create(receiverNode->id());
-            updateChange->setValue(1584);
-            updateChange->setPropertyName("someName");
-
-
-            // THEN -> we do track properties by default QNode::DefaultTrackMode
-            // (unless marked as an intermediate change)
-            QCOMPARE(postman.shouldNotifyFrontend(updateChange), true);
-        }
-
-        {
-            // WHEN
-            receiverNode->setDefaultPropertyTrackingMode(QNode::TrackAllValues);
-
-            auto updateChange = QPropertyUpdatedChangePtr::create(receiverNode->id());
-            updateChange->setValue(1584);
-            updateChange->setPropertyName("someName");
-            QPropertyUpdatedChangeBasePrivate::get(updateChange.data())->m_isIntermediate
-                = true;
-
-            // THEN -> we do track properties marked as intermediate when
-            // using TrackAllPropertiesMode
-            QCOMPARE(postman.shouldNotifyFrontend(updateChange), true);
-        }
-
-        {
-            // GIVEN
-            receiverNode->setDefaultPropertyTrackingMode(QNode::DontTrackValues);
-            receiverNode->setPropertyTracking(QStringLiteral("vette"), Qt3DCore::QNode::TrackAllValues);
-
-            {
-                // WHEN
-                auto updateChange = QPropertyUpdatedChangePtr::create(receiverNode->id());
-                updateChange->setValue(1584);
-                updateChange->setPropertyName("someName");
-                QPropertyUpdatedChangeBasePrivate::get(updateChange.data())->m_isIntermediate
-                    = true;
-
-                // THEN -> we don't track properties by default, unless named when
-                // using TrackNamedPropertiesMode
-                QCOMPARE(postman.shouldNotifyFrontend(updateChange), false);
-            }
-
-            {
-                // WHEN
-                auto updateChange = QPropertyUpdatedChangePtr::create(receiverNode->id());
-                updateChange->setValue(1584);
-                updateChange->setPropertyName("vette");
-                QPropertyUpdatedChangeBasePrivate::get(updateChange.data())->m_isIntermediate
-                    = true;
-
-                // THEN
-                QCOMPARE(postman.shouldNotifyFrontend(updateChange), true);
-            }
-        }
-
-        {
-            // GIVEN
-            receiverNode->setPropertyTracking(QStringLiteral("vette"), Qt3DCore::QNode::TrackAllValues);
-            receiverNode->setDefaultPropertyTrackingMode(QNode::TrackAllValues);
-
-            {
-                // WHEN
-                auto updateChange = QPropertyUpdatedChangePtr::create(receiverNode->id());
-                updateChange->setValue(1584);
-                updateChange->setPropertyName("someName");
-
-                // THEN -> we don't track properties by default
-                QCOMPARE(postman.shouldNotifyFrontend(updateChange), true);
-            }
-
-            {
-                // WHEN
-                auto updateChange = QPropertyUpdatedChangePtr::create(receiverNode->id());
-                updateChange->setValue(1584);
-                updateChange->setPropertyName("vette");
-
-                // THEN -> we don't track properties by default
-                QCOMPARE(postman.shouldNotifyFrontend(updateChange), true);
-            }
-        }
-
-        {
-            // GIVEN
-            receiverNode->clearPropertyTrackings();
-            receiverNode->setDefaultPropertyTrackingMode(QNode::TrackFinalValues);
-
-            {
-                // WHEN
-                auto updateChange = QPropertyUpdatedChangePtr::create(receiverNode->id());
-                updateChange->setValue(1584);
-                updateChange->setPropertyName("someName");
-
-                // THEN -> we do track properties by default, unless marked as intermediate
-                QCOMPARE(postman.shouldNotifyFrontend(updateChange), true);
-            }
-
-            {
-                // WHEN
-                auto addedChange
-                    = QPropertyNodeAddedChangePtr::create(receiverNode->id(), receiverNode);
-
-                // THEN -> only QPropertyUpdatedChangePtr are filtered
-                QCOMPARE(postman.shouldNotifyFrontend(addedChange), true);
-            }
-            {
-                // WHEN
-                auto removedChange
-                    = QPropertyNodeRemovedChangePtr::create(receiverNode->id(), receiverNode);
-
-                // THEN -> only QPropertyUpdatedChangePtr are filtered
-                QCOMPARE(postman.shouldNotifyFrontend(removedChange), true);
-            }
-        }
-
-        {
-            // GIVEN
-            receiverNode->clearPropertyTrackings();
-            receiverNode->setDefaultPropertyTrackingMode(QNode::TrackFinalValues);
-
-            {
-                // WHEN
-                auto updateChange = QPropertyUpdatedChangePtr::create(receiverNode->id());
-                updateChange->setValue(1584);
-                updateChange->setPropertyName("someName");
-                QPropertyUpdatedChangeBasePrivate::get(updateChange.data())->m_isIntermediate
-                    = true;
-
-                // THEN -> we don't track intermediate properties by default
-                QCOMPARE(postman.shouldNotifyFrontend(updateChange), false);
-            }
-
-            {
-                // WHEN
-                auto updateChange = QPropertyUpdatedChangePtr::create(receiverNode->id());
-                updateChange->setValue(1584);
-                updateChange->setPropertyName("someName");
-
-                // THEN
-                QCOMPARE(postman.shouldNotifyFrontend(updateChange), true);
-            }
-
-        }
-    }
-
 };
 
 QTEST_MAIN(tst_QPostman)
diff --git a/tests/auto/core/qscene/tst_qscene.cpp b/tests/auto/core/qscene/tst_qscene.cpp
index ecc72e992..eb6a8c5ec 100644
--- a/tests/auto/core/qscene/tst_qscene.cpp
+++ b/tests/auto/core/qscene/tst_qscene.cpp
@@ -26,6 +26,10 @@
 **
 ****************************************************************************/
 
+// TODO Remove in Qt6
+#include <QtCore/qcompilerdetection.h>
+QT_WARNING_DISABLE_DEPRECATED
+
 #include <QtTest/QtTest>
 #include <Qt3DCore/private/qscene_p.h>
 #include <Qt3DCore/qnode.h>
diff --git a/tests/auto/core/qtransform/tst_qtransform.cpp b/tests/auto/core/qtransform/tst_qtransform.cpp
index 37848ffd6..18a906e4c 100644
--- a/tests/auto/core/qtransform/tst_qtransform.cpp
+++ b/tests/auto/core/qtransform/tst_qtransform.cpp
@@ -26,6 +26,10 @@
 **
 ****************************************************************************/
 
+// TODO Remove in Qt6
+#include <QtCore/qcompilerdetection.h>
+QT_WARNING_DISABLE_DEPRECATED
+
 #include <QtTest/QtTest>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qtransform.h>
diff --git a/tests/auto/coretest/qbackendnodetester.cpp b/tests/auto/coretest/qbackendnodetester.cpp
index be9767828..bd5fb85d1 100644
--- a/tests/auto/coretest/qbackendnodetester.cpp
+++ b/tests/auto/coretest/qbackendnodetester.cpp
@@ -57,15 +57,21 @@ void QBackendNodeTester::simulateInitialization(QNode *frontend, QBackendNode *b
 {
     Q_ASSERT(frontend);
     Q_ASSERT(backend);
+    QT_WARNING_PUSH
+    QT_WARNING_DISABLE_DEPRECATED
     const auto change = frontend->createNodeCreationChange();
     backend->setPeerId(change->subjectId());
     backend->setEnabled(change->isNodeEnabled());
     backend->initializeFromPeer(change);
+    QT_WARNING_POP
 }
 
 void QBackendNodeTester::sceneChangeEvent(QBackendNode *backend, const Qt3DCore::QSceneChangePtr &e)
 {
+    QT_WARNING_PUSH
+    QT_WARNING_DISABLE_DEPRECATED
     backend->sceneChangeEvent(e);
+    QT_WARNING_POP
 }
 
 } // namespace Qt3DCore
diff --git a/tests/auto/coretest/testpostmanarbiter.cpp b/tests/auto/coretest/testpostmanarbiter.cpp
index d1263b8f7..d2e404809 100644
--- a/tests/auto/coretest/testpostmanarbiter.cpp
+++ b/tests/auto/coretest/testpostmanarbiter.cpp
@@ -26,6 +26,10 @@
 **
 ****************************************************************************/
 
+// TODO Remove in Qt6
+#include <QtCore/qcompilerdetection.h>
+QT_WARNING_DISABLE_DEPRECATED
+
 #include "testpostmanarbiter_p.h"
 #include <Qt3DCore/private/qnode_p.h>
 
diff --git a/tests/auto/render/entity/tst_entity.cpp b/tests/auto/render/entity/tst_entity.cpp
index 93f2614b8..2629e6953 100644
--- a/tests/auto/render/entity/tst_entity.cpp
+++ b/tests/auto/render/entity/tst_entity.cpp
@@ -26,6 +26,10 @@
 **
 ****************************************************************************/
 
+// TODO Remove in Qt6
+#include <QtCore/qcompilerdetection.h>
+QT_WARNING_DISABLE_DEPRECATED
+
 #include <QtTest/QtTest>
 #include <Qt3DRender/private/entity_p.h>
 #include <Qt3DRender/private/entity_p_p.h>
diff --git a/tests/auto/render/qabstracttexture/tst_qabstracttexture.cpp b/tests/auto/render/qabstracttexture/tst_qabstracttexture.cpp
index a1973176e..6fad09a0d 100644
--- a/tests/auto/render/qabstracttexture/tst_qabstracttexture.cpp
+++ b/tests/auto/render/qabstracttexture/tst_qabstracttexture.cpp
@@ -26,6 +26,9 @@
 **
 ****************************************************************************/
 
+// TODO Remove in Qt6
+#include <QtCore/qcompilerdetection.h>
+QT_WARNING_DISABLE_DEPRECATED
 
 #include <QtTest/QTest>
 #include <Qt3DRender/qabstracttexture.h>
diff --git a/tests/auto/render/qgeometry/tst_qgeometry.cpp b/tests/auto/render/qgeometry/tst_qgeometry.cpp
index 017314ecf..e790ba9cc 100644
--- a/tests/auto/render/qgeometry/tst_qgeometry.cpp
+++ b/tests/auto/render/qgeometry/tst_qgeometry.cpp
@@ -26,6 +26,10 @@
 **
 ****************************************************************************/
 
+// TODO Remove in Qt6
+#include <QtCore/qcompilerdetection.h>
+QT_WARNING_DISABLE_DEPRECATED
+
 #include <QtTest/QTest>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/private/qnode_p.h>
diff --git a/tests/auto/render/qrendercapture/tst_qrendercapture.cpp b/tests/auto/render/qrendercapture/tst_qrendercapture.cpp
index 9ed7651fc..35c645d41 100644
--- a/tests/auto/render/qrendercapture/tst_qrendercapture.cpp
+++ b/tests/auto/render/qrendercapture/tst_qrendercapture.cpp
@@ -26,6 +26,9 @@
 **
 ****************************************************************************/
 
+// TODO Remove in Qt6
+#include <QtCore/qcompilerdetection.h>
+QT_WARNING_DISABLE_DEPRECATED
 
 #include <QtTest/QTest>
 #include <QtTest/QSignalSpy>
diff --git a/tests/auto/render/qsetfence/tst_qsetfence.cpp b/tests/auto/render/qsetfence/tst_qsetfence.cpp
index c602e6f5c..ad92e9fe0 100644
--- a/tests/auto/render/qsetfence/tst_qsetfence.cpp
+++ b/tests/auto/render/qsetfence/tst_qsetfence.cpp
@@ -37,6 +37,10 @@
 **
 ****************************************************************************/
 
+// TODO Remove in Qt6
+#include <QtCore/qcompilerdetection.h>
+QT_WARNING_DISABLE_DEPRECATED
+
 #include <QtTest/QTest>
 #include <Qt3DRender/qsetfence.h>
 #include <Qt3DRender/private/qsetfence_p.h>
@@ -153,7 +157,6 @@ private Q_SLOTS:
             QCOMPARE(creationChanges.size(), 1);
 
             const auto creationChangeData = qSharedPointerCast<Qt3DCore::QNodeCreatedChange<Qt3DRender::QSetFenceData>>(creationChanges.first());
-            const Qt3DRender::QSetFenceData cloneData = creationChangeData->data;
 
             QCOMPARE(setFence.id(), creationChangeData->subjectId());
             QCOMPARE(setFence.isEnabled(), true);
@@ -174,7 +177,6 @@ private Q_SLOTS:
             QCOMPARE(creationChanges.size(), 1);
 
             const auto creationChangeData = qSharedPointerCast<Qt3DCore::QNodeCreatedChange<Qt3DRender::QSetFenceData>>(creationChanges.first());
-            const Qt3DRender::QSetFenceData cloneData = creationChangeData->data;
 
             QCOMPARE(setFence.id(), creationChangeData->subjectId());
             QCOMPARE(setFence.isEnabled(), false);
diff --git a/tests/auto/render/qshaderprogram/tst_qshaderprogram.cpp b/tests/auto/render/qshaderprogram/tst_qshaderprogram.cpp
index a261d0860..18dd1306a 100644
--- a/tests/auto/render/qshaderprogram/tst_qshaderprogram.cpp
+++ b/tests/auto/render/qshaderprogram/tst_qshaderprogram.cpp
@@ -26,6 +26,9 @@
 **
 ****************************************************************************/
 
+// TODO Remove in Qt6
+#include <QtCore/qcompilerdetection.h>
+QT_WARNING_DISABLE_DEPRECATED
 
 #include <QtTest/QTest>
 #include <Qt3DRender/qshaderprogram.h>
diff --git a/tests/auto/render/setfence/tst_setfence.cpp b/tests/auto/render/setfence/tst_setfence.cpp
index 92f7a0acc..75c414e7f 100644
--- a/tests/auto/render/setfence/tst_setfence.cpp
+++ b/tests/auto/render/setfence/tst_setfence.cpp
@@ -37,7 +37,9 @@
 **
 ****************************************************************************/
 
-
+// TODO Remove in Qt6
+#include <QtCore/qcompilerdetection.h>
+QT_WARNING_DISABLE_DEPRECATED
 
 #include <QtTest/QTest>
 #include <Qt3DRender/qsetfence.h>