feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner.NodeInstances: Fix restore bindings for reset

Browse Source 
Task-number: QTCREATORBUG-5415

Change-Id: I1cbc8dda5eb1512db52a2767837b53eb136dc387
Reviewed-on: http://codereview.qt.nokia.com/1664
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
This commit is contained in:
Marco Bubke
2011-07-14 15:15:57 +02:00
parent 7ec3a259f4
commit 8a5fffb945
9 changed files with 41 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.h
View File

@@ -49,6 +49,7 @@ class QDeclarativeEngine;
class QDeclarativeProperty;
class QDeclarativeContext;
class QDeclarativeBinding;
class QDeclarativeAbstractBinding;
QT_END_NAMESPACE
namespace QmlDesigner {
@@ -151,7 +152,9 @@ public:
virtual void activateState();
virtual void deactivateState();
void populateResetValueHash();
void populateResetHashes();
bool hasValidResetBinding(const QString &propertyName) const;
QDeclarativeAbstractBinding *resetBinding(const QString &propertyName) const;
QVariant resetValue(const QString &propertyName) const;
void setResetValue(const QString &propertyName, const QVariant &value);
@@ -190,6 +193,7 @@ protected:
private:
QHash<QString, QVariant> m_resetValueHash;
QHash<QString, QWeakPointer<QDeclarativeAbstractBinding> > m_resetBindingHash;
QHash<QString, ServerNodeInstance> m_modelAbstractPropertyHash;
mutable QHash<QString, bool> m_hasBindingHash;
qint32 m_instanceId;