summaryrefslogtreecommitdiffstats
path: root/src/core/nodes
diff options
context:
space:
mode:
authorMike Krus <mike.krus@kdab.com>2020-01-11 11:17:55 +0000
committerMike Krus <mike.krus@kdab.com>2020-01-14 08:04:10 +0000
commit0dc38ecbbff992701756d92821e20f360821710f (patch)
tree37318a566d80d8fc54dfa1b421a62ec7ac6a7fd0 /src/core/nodes
parenta40654ad451569a19b49bd2d6b9cfc4fa0cc12b8 (diff)
Fix deprecation handling
Change-Id: If981333f7a3d78028d4f08c59867453d4192b955 Task-number: QTBUG-81058 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/core/nodes')
-rw-r--r--src/core/nodes/qnode_p.h3
-rw-r--r--src/core/nodes/qnodecreatedchangegenerator_p.h3
2 files changed, 6 insertions, 0 deletions
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;