diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-14 12:02:47 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-14 12:47:58 +0100 |
| commit | 1382b0cfb336cc04924d61b46f0b69dadb1c3d39 (patch) | |
| tree | f7b5d12a0475d9d4ee5d4ba17fd02dc36ae96b97 /src/core/nodes/qnode_p.h | |
| parent | f76259554244bf3fa3045e58c1f59f3eac1b6a03 (diff) | |
| parent | 31f424bb81cd2583920d3d521e1e01f01c2d28e2 (diff) | |
Merge remote-tracking branch 'origin/5.10.1' into 5.11
Conflicts:
src/render/backend/renderer.cpp
src/render/backend/renderer_p.h
tests/auto/render/renderer/tst_renderer.cpp
Done-with: Svenn-Arne Dragly <svenn-arne.dragly@qt.io>
Change-Id: I2ca9bac4777e51434579edf86030414734f533ac
Diffstat (limited to 'src/core/nodes/qnode_p.h')
| -rw-r--r-- | src/core/nodes/qnode_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/nodes/qnode_p.h b/src/core/nodes/qnode_p.h index a122993fe..c203b342f 100644 --- a/src/core/nodes/qnode_p.h +++ b/src/core/nodes/qnode_p.h @@ -100,6 +100,7 @@ public: bool m_blockNotifications; bool m_hasBackendNode; bool m_enabled; + bool m_notifiedParent; QNode::PropertyTrackingMode m_defaultPropertyTrackMode; QHash<QString, QNode::PropertyTrackingMode> m_trackedPropertiesOverrides; @@ -137,10 +138,11 @@ public: static const QMetaObject *findStaticMetaObject(const QMetaObject *metaObject); + void _q_postConstructorInit(); + private: void notifyCreationChange(); void notifyDestructionChangesAndRemoveFromScene(); - void _q_postConstructorInit(); void _q_addChild(QNode *childNode); void _q_removeChild(QNode *childNode); void _q_setParentHelper(QNode *parent); |