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

Merge remote-tracking branch 'origin/2.7'

Browse Source 
Conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
	tests/auto/treeviewfind/treeviewfind.pro

Change-Id: I1ec788373656c947b50d72df6c26c91312469692
This commit is contained in:
Eike Ziller
2013-04-23 11:13:25 +02:00
parent 48687fd8a1 c4be740bd6
commit 38b61177f6
48 changed files with 1270 additions and 1209 deletions
Download Patch File Download Diff File Expand all files Collapse all files
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
+8 -5
View File
@@ -63,7 +63,6 @@ class ObjectNodeInstance
public:
typedef QSharedPointer<ObjectNodeInstance> Pointer;
typedef QWeakPointer<ObjectNodeInstance> WeakPointer;
explicit ObjectNodeInstance(QObject *object);
virtual ~ObjectNodeInstance();
void destroy();
@@ -97,6 +96,9 @@ public:
virtual bool isTransition() const;
virtual bool isPositioner() const;
virtual bool isQuickItem() const;
virtual bool isQuickWindow() const;
virtual bool isGraphical() const;
virtual bool isLayoutable() const;
virtual bool equalGraphicsItem(QGraphicsItem *item) const;
@@ -153,9 +155,9 @@ public:
virtual bool hasContent() const;
virtual bool isResizable() const;
virtual bool isMovable() const;
bool isInPositioner() const;
void setInPositioner(bool isInPositioner);
virtual void refreshPositioner();
bool isInLayoutable() const;
void setInLayoutable(bool isInLayoutable);
virtual void refreshLayoutable();
bool hasBindingForProperty(const PropertyName &name, bool *hasChanged = 0) const;
@@ -181,6 +183,7 @@ public:
virtual void updateDirtyNodeRecursive();
protected:
explicit ObjectNodeInstance(QObject *object);
void doResetProperty(const PropertyName &propertyName);
void removeFromOldProperty(QObject *object, QObject *oldParent, const PropertyName &oldParentProperty);
void addToNewProperty(QObject *object, QObject *newParent, const PropertyName &newParentProperty);
@@ -201,7 +204,7 @@ private:
NodeInstanceMetaObject *m_metaObject;
qint32 m_instanceId;
bool m_deleteHeldInstance;
bool m_isInPositioner;
bool m_isInLayoutable;
};
} // namespace Internal