Merge branch '2.3'

[qt-creator-jp/qt-creator-jp.git] / share / qtcreator / qml / qmlpuppet / instances / objectnodeinstance.h

diff --git a/share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.h b/share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.h
index 4ce1398..69926ea 100644 (file)
--- a/share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.h
@@ -161,6 +161,7 @@ public:
     virtual bool isMovable() const;
     bool isInPositioner() const;
     void setInPositioner(bool isInPositioner);
+    virtual void refreshPositioner();
 
     bool hasBindingForProperty(const QString &name, bool *hasChanged = 0) const;
 
@@ -186,6 +187,7 @@ protected:
     void removeFromOldProperty(QObject *object, QObject *oldParent, const QString &oldParentProperty);
     void addToNewProperty(QObject *object, QObject *newParent, const QString &newParentProperty);
     void deleteObjectsInList(const QDeclarativeProperty &metaProperty);
+    QVariant convertSpecialCharacter(const QVariant& value) const;
 
 private:
     QHash<QString, QVariant> m_resetValueHash;