Use QDeclarativeScriptString for ParentChange.

So that scope resolution is correct, e.g. "width: parent.width-10;" in
a ParentChange works correctly.

Task-number: QTBUG-10675

1 files changed, 18 insertions, 18 deletions

diff --git a/src/declarative/util/qdeclarativestateoperations_p.h b/src/declarative/util/qdeclarativestateoperations_p.h
index 21a86f5..05ad052 100644
--- a/src/declarative/util/qdeclarativestateoperations_p.h
+++ b/src/declarative/util/qdeclarativestateoperations_p.h
@@ -62,12 +62,12 @@ class Q_DECLARATIVE_EXPORT QDeclarativeParentChange : public QDeclarativeStateOp
 
     Q_PROPERTY(QDeclarativeItem *target READ object WRITE setObject)
     Q_PROPERTY(QDeclarativeItem *parent READ parent WRITE setParent)
-    Q_PROPERTY(qreal x READ x WRITE setX)
-    Q_PROPERTY(qreal y READ y WRITE setY)
-    Q_PROPERTY(qreal width READ width WRITE setWidth)
-    Q_PROPERTY(qreal height READ height WRITE setHeight)
-    Q_PROPERTY(qreal scale READ scale WRITE setScale)
-    Q_PROPERTY(qreal rotation READ rotation WRITE setRotation)
+    Q_PROPERTY(QDeclarativeScriptString x READ x WRITE setX)
+    Q_PROPERTY(QDeclarativeScriptString y READ y WRITE setY)
+    Q_PROPERTY(QDeclarativeScriptString width READ width WRITE setWidth)
+    Q_PROPERTY(QDeclarativeScriptString height READ height WRITE setHeight)
+    Q_PROPERTY(QDeclarativeScriptString scale READ scale WRITE setScale)
+    Q_PROPERTY(QDeclarativeScriptString rotation READ rotation WRITE setRotation)
 public:
     QDeclarativeParentChange(QObject *parent=0);
     ~QDeclarativeParentChange();
@@ -80,28 +80,28 @@ public:
 
     QDeclarativeItem *originalParent() const;
 
-    qreal x() const;
-    void setX(qreal x);
+    QDeclarativeScriptString x() const;
+    void setX(QDeclarativeScriptString x);
     bool xIsSet() const;
 
-    qreal y() const;
-    void setY(qreal y);
+    QDeclarativeScriptString y() const;
+    void setY(QDeclarativeScriptString y);
     bool yIsSet() const;
 
-    qreal width() const;
-    void setWidth(qreal width);
+    QDeclarativeScriptString width() const;
+    void setWidth(QDeclarativeScriptString width);
     bool widthIsSet() const;
 
-    qreal height() const;
-    void setHeight(qreal height);
+    QDeclarativeScriptString height() const;
+    void setHeight(QDeclarativeScriptString height);
     bool heightIsSet() const;
 
-    qreal scale() const;
-    void setScale(qreal scale);
+    QDeclarativeScriptString scale() const;
+    void setScale(QDeclarativeScriptString scale);
     bool scaleIsSet() const;
 
-    qreal rotation() const;
-    void setRotation(qreal rotation);
+    QDeclarativeScriptString rotation() const;
+    void setRotation(QDeclarativeScriptString rotation);
     bool rotationIsSet() const;
 
     virtual ActionList actions();