From 4ec82624f77d49c2e5f02b04518c8bde1be16145 Mon Sep 17 00:00:00 2001 From: Yann Bodson Date: Mon, 24 Aug 2009 14:55:16 +1000 Subject: Use 'extend' for now. 'extends' is a JavaScript reserved words --- src/declarative/util/qmlstate.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/declarative/util/qmlstate.h b/src/declarative/util/qmlstate.h index d15bd4a..0b48449 100644 --- a/src/declarative/util/qmlstate.h +++ b/src/declarative/util/qmlstate.h @@ -81,7 +81,7 @@ public: void deleteFromBinding(); }; -class ActionEvent +class ActionEvent { public: virtual ~ActionEvent(); @@ -126,7 +126,7 @@ class Q_DECLARATIVE_EXPORT QmlState : public QObject Q_PROPERTY(QString name READ name WRITE setName) Q_PROPERTY(QmlBinding *when READ when WRITE setWhen) - Q_PROPERTY(QString extends READ extends WRITE setExtends) + Q_PROPERTY(QString extend READ extends WRITE setExtends) Q_PROPERTY(QmlList* changes READ changes) Q_CLASSINFO("DefaultProperty", "changes") @@ -137,7 +137,7 @@ public: QString name() const; void setName(const QString &); - /*'when' is a QmlBinding to limit state changes oscillation + /*'when' is a QmlBinding to limit state changes oscillation due to the unpredictable order of evaluation of bound expressions*/ bool isWhenKnown() const; QmlBinding *when() const; -- cgit v0.12