diff options
author | Laszlo Agocs <laszlo.agocs@qt.io> | 2018-05-23 17:54:26 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2018-05-23 17:54:33 +0200 |
commit | 41ccb47065b9ba4418d792644415a424270b256f (patch) | |
tree | 7a1ae164efc44b4cd74344fb88d13fe1158576c4 /src/runtime/q3dsuippresentation_p.h | |
parent | 8bb3378d0d7c82eb1896ac043570ddab7c2edae9 (diff) | |
parent | b81bba4795eea06d4dcbf39c99f986de2654077d (diff) |
Merge remote-tracking branch 'origin/2.0'v2.0.0-beta2
Change-Id: I1d34fa789a3962e6efe595fdd028db953749bd53
Diffstat (limited to 'src/runtime/q3dsuippresentation_p.h')
-rw-r--r-- | src/runtime/q3dsuippresentation_p.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/runtime/q3dsuippresentation_p.h b/src/runtime/q3dsuippresentation_p.h index bc4bec3..6345db2 100644 --- a/src/runtime/q3dsuippresentation_p.h +++ b/src/runtime/q3dsuippresentation_p.h @@ -834,7 +834,7 @@ public: void applyPropertyChanges(const Q3DSPropertyChangeList &changeList) override; int mapChangeFlags(const Q3DSPropertyChangeList &changeList) override; - const Q3DSPropertyChangeList *masterRollbackList() const { return m_masterRollbackList.data(); } + const Q3DSPropertyChangeList &masterRollbackList() const { return m_masterRollbackList; } QStringList propertyNames() const override; QVariantList propertyValues() const override; @@ -870,7 +870,7 @@ protected: qint32 m_skeletonId = -1; RotationOrder m_rotationOrder = YXZ; Orientation m_orientation = LeftHanded; - QScopedPointer<Q3DSPropertyChangeList> m_masterRollbackList; + Q3DSPropertyChangeList m_masterRollbackList; private: Q_DISABLE_COPY(Q3DSNode) @@ -1842,6 +1842,8 @@ public: QVariant customProperty(const QString &name) const { return m_effectPropertyVals.value(name); } Q3DSPropertyChange setCustomProperty(const QString &name, const QVariant &value); + const Q3DSPropertyChangeList &masterRollbackList() const { return m_masterRollbackList; } + private: Q_DISABLE_COPY(Q3DSEffectInstance) template<typename V> void setProps(const V &attrs, PropSetFlags flags); @@ -1852,6 +1854,7 @@ private: bool m_active = true; QVariantMap m_effectPropertyVals; Q3DSPropertyChangeList m_pendingCustomProperties; + Q3DSPropertyChangeList m_masterRollbackList; }; class Q3DSV_PRIVATE_EXPORT Q3DSBehaviorInstance : public Q3DSGraphObject |