Merge branch 'dev' into wip/animationwip/animation

Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f

1 files changed, 9 insertions, 7 deletions

diff --git a/src/core/nodes/qnode_p.h b/src/core/nodes/qnode_p.h
index 5d6329e62..ad9d2376e 100644
--- a/src/core/nodes/qnode_p.h
+++ b/src/core/nodes/qnode_p.h
@@ -51,13 +51,15 @@
 // We mean it.
 //
 
-#include <private/qobject_p.h>
 #include <Qt3DCore/qnode.h>
-#include <Qt3DCore/private/qobservableinterface_p.h>
+
+#include <functional>
+
+#include <Qt3DCore/private/propertychangehandler_p.h>
 #include <Qt3DCore/private/qchangearbiter_p.h>
+#include <Qt3DCore/private/qobservableinterface_p.h>
 #include <Qt3DCore/private/qt3dcore_global_p.h>
-#include "propertychangehandler_p.h"
-#include <functional>
+#include <QtCore/private/qobject_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -74,7 +76,7 @@ public:
 
     void init(QNode *parent);
 
-    void setScene(QScene *scene);
+    virtual void setScene(QScene *scene);
     QScene *scene() const;
 
     void setArbiter(QLockableObserverInterface *arbiter) Q_DECL_OVERRIDE;
@@ -98,8 +100,8 @@ public:
     bool m_blockNotifications;
     bool m_hasBackendNode;
     bool m_enabled;
-    QNode::PropertyTrackMode m_propertyTrackMode;
-    QStringList m_trackedProperties;
+    QNode::PropertyTrackingMode m_defaultPropertyTrackMode;
+    QHash<QString, QNode::PropertyTrackingMode> m_trackedPropertiesOverrides;
 
     static QNodePrivate *get(QNode *q);
     static void nodePtrDeleter(QNode *q);