diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-14 11:55:27 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-02-14 11:56:26 +0000 |
| commit | a400bbe50deb98f5d924cd4f6562e1b868e73248 (patch) | |
| tree | a636e2224d3677aca2406bac5d835100610500e3 /src/core/nodes/qnode_p.h | |
| parent | d360e16fdcab2197924e2505695c412bcaadbbe0 (diff) | |
| parent | 1382b0cfb336cc04924d61b46f0b69dadb1c3d39 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.10.1' into 5.11" into refs/staging/5.11v5.11.0-alpha1
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); |