Fix deprecation handling

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

8 files changed, 32 insertions, 1 deletions

diff --git a/src/core/changes/qnodecreatedchange.h b/src/core/changes/qnodecreatedchange.h
index 326a83e99..31d00f3ac 100644
--- a/src/core/changes/qnodecreatedchange.h
+++ b/src/core/changes/qnodecreatedchange.h
@@ -71,11 +71,14 @@ template<typename T>
 class QNodeCreatedChange : public QNodeCreatedChangeBase
 {
 public:
+    QT_WARNING_PUSH
+    QT_WARNING_DISABLE_DEPRECATED
     explicit QNodeCreatedChange(const QNode *_node)
         : QNodeCreatedChangeBase(_node)
         , data()
     {
     }
+    QT_WARNING_POP
 
     T data;
 };
diff --git a/src/core/changes/qscenechange_p.h b/src/core/changes/qscenechange_p.h
index 32006807c..4e112fe93 100644
--- a/src/core/changes/qscenechange_p.h
+++ b/src/core/changes/qscenechange_p.h
@@ -63,12 +63,15 @@ namespace Qt3DCore {
 class QSceneChange;
 class QNodeId;
 
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
 struct NodeRelationshipChange {
     QNode *node;
     QNode *subNode;
     ChangeFlag change;
     const char *property;
 };
+QT_WARNING_POP
 
 class Q_3DCORE_PRIVATE_EXPORT QSceneChangePrivate
 {
@@ -82,7 +85,10 @@ public :
 
     QNodeId m_subjectId;
     QSceneChange::DeliveryFlags m_deliveryFlags;
+    QT_WARNING_PUSH
+    QT_WARNING_DISABLE_DEPRECATED
     ChangeFlag m_type;
+    QT_WARNING_POP
 };
 
 } // Qt3D
diff --git a/src/core/changes/qskeletoncreatedchange_p.h b/src/core/changes/qskeletoncreatedchange_p.h
index c20bcae85..9f0c361da 100644
--- a/src/core/changes/qskeletoncreatedchange_p.h
+++ b/src/core/changes/qskeletoncreatedchange_p.h
@@ -80,17 +80,20 @@ template<typename T>
 class QSkeletonCreatedChange : public QSkeletonCreatedChangeBase
 {
 public:
+    QT_WARNING_PUSH
+    QT_WARNING_DISABLE_DEPRECATED
     explicit QSkeletonCreatedChange(const QAbstractSkeleton *_skeleton)
         : QSkeletonCreatedChangeBase(_skeleton)
         , data()
     {
     }
+    QT_WARNING_POP
 
     T data;
 };
 
 template<typename T>
-using QSkeletonCreatedChangePtr Q3D_DECL_DEPRECATED = QSharedPointer<QSkeletonCreatedChange<T>>;
+using QSkeletonCreatedChangePtr = QSharedPointer<QSkeletonCreatedChange<T>>;
 
 } // namespace Qt3DCore
 
diff --git a/src/core/changes/qtypedpropertyupdatechange_p.h b/src/core/changes/qtypedpropertyupdatechange_p.h
index f196ee5eb..6793144ca 100644
--- a/src/core/changes/qtypedpropertyupdatechange_p.h
+++ b/src/core/changes/qtypedpropertyupdatechange_p.h
@@ -61,11 +61,14 @@ template<typename T>
 class QTypedPropertyUpdatedChange : public QStaticPropertyUpdatedChangeBase
 {
 public:
+    QT_WARNING_PUSH
+    QT_WARNING_DISABLE_DEPRECATED
     explicit QTypedPropertyUpdatedChange(QNodeId _subjectId)
         : QStaticPropertyUpdatedChangeBase(_subjectId)
         , data()
     {
     }
+    QT_WARNING_POP
 
     T data;
 };
diff --git a/src/core/core.pro b/src/core/core.pro
index b1ba54be2..b76198e35 100644
--- a/src/core/core.pro
+++ b/src/core/core.pro
@@ -2,6 +2,7 @@ TARGET     = Qt3DCore
 MODULE     = 3dcore
 
 QT         = core-private gui-private network
+DEFINES   += BUILD_QT3D_MODULE
 
 gcov {
     QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage
diff --git a/src/core/nodes/qnode_p.h b/src/core/nodes/qnode_p.h
index 61aa81c81..5aa4c5328 100644
--- a/src/core/nodes/qnode_p.h
+++ b/src/core/nodes/qnode_p.h
@@ -90,7 +90,10 @@ public:
     void updatePropertyTrackMode();
 
     void update();
+    QT_WARNING_PUSH
+    QT_WARNING_DISABLE_DEPRECATED
     void updateNode(QNode *node, const char* property, ChangeFlag change);
+    QT_WARNING_POP
 
     Q_DECLARE_PUBLIC(QNode)
 
diff --git a/src/core/nodes/qnodecreatedchangegenerator_p.h b/src/core/nodes/qnodecreatedchangegenerator_p.h
index b2e8fa08b..35e5b673e 100644
--- a/src/core/nodes/qnodecreatedchangegenerator_p.h
+++ b/src/core/nodes/qnodecreatedchangegenerator_p.h
@@ -69,6 +69,8 @@ public:
 private:
     void createCreationChange(QNode *node)
     {
+        QT_WARNING_PUSH
+        QT_WARNING_DISABLE_DEPRECATED
         const auto creationChange = node->createNodeCreationChange();
         m_creationChanges.push_back(creationChange);
 
@@ -82,6 +84,7 @@ private:
 
         // Mark this node as having been handled for creation so that it is picked up
         d->m_hasBackendNode = true;
+        QT_WARNING_POP
     }
 
     QVector<QNodeCreatedChangeBasePtr> m_creationChanges;
diff --git a/src/core/qchangearbiter_p.h b/src/core/qchangearbiter_p.h
index 7d48c390a..483b46575 100644
--- a/src/core/qchangearbiter_p.h
+++ b/src/core/qchangearbiter_p.h
@@ -84,7 +84,10 @@ public:
     virtual QAbstractPostman *postman() const = 0;
     virtual void addDirtyFrontEndNode(QNode *node) = 0;
     virtual void removeDirtyFrontEndNode(QNode *node) = 0;
+    QT_WARNING_PUSH
+    QT_WARNING_DISABLE_DEPRECATED
     virtual void addDirtyFrontEndNode(QNode *node, QNode *subNode, const char *property, ChangeFlag change) = 0;
+    QT_WARNING_POP
 };
 
 class Q_3DCORE_PRIVATE_EXPORT QChangeArbiter final
@@ -100,9 +103,12 @@ public:
 
     void syncChanges();
 
+    QT_WARNING_PUSH
+    QT_WARNING_DISABLE_DEPRECATED
     void registerObserver(QObserverInterface *observer,
                           QNodeId nodeId,
                           ChangeFlags changeFlags = AllChanges);
+    QT_WARNING_POP
     void unregisterObserver(QObserverInterface *observer,
                             QNodeId nodeId);
 
@@ -111,7 +117,10 @@ public:
     void sceneChangeEventWithLock(const QSceneChangeList &e) override; // QLockableObserverInterface impl
 
     void addDirtyFrontEndNode(QNode *node) override;
+    QT_WARNING_PUSH
+    QT_WARNING_DISABLE_DEPRECATED
     void addDirtyFrontEndNode(QNode *node, QNode *subNode, const char *property, ChangeFlag change) override;
+    QT_WARNING_POP
     void removeDirtyFrontEndNode(QNode *node) override;
     QVector<QNode *> takeDirtyFrontEndNodes();
     QVector<NodeRelationshipChange> takeDirtyFrontEndSubNodes();