diff options
author | Roberto Raggi <roberto.raggi@nokia.com> | 2010-02-25 09:34:28 (GMT) |
---|---|---|
committer | Roberto Raggi <roberto.raggi@nokia.com> | 2010-02-25 09:34:28 (GMT) |
commit | 0e4dd15a90c119cea4ada833d88b51e336f53ee7 (patch) | |
tree | 86eef14fe41bc50e0f638e91227e5ad96a5181de /src/declarative/qml/parser/qdeclarativejsast_p.h | |
parent | 75d61cbd7d2c72abb1fcf486c97bbb7429aea81b (diff) | |
download | Qt-0e4dd15a90c119cea4ada833d88b51e336f53ee7.zip Qt-0e4dd15a90c119cea4ada833d88b51e336f53ee7.tar.gz Qt-0e4dd15a90c119cea4ada833d88b51e336f53ee7.tar.bz2 |
Introduced alternative syntax for defining QML bindings.
Now it is possible to define bindings using the `on' context keyword.
For example, you can write
Behavior on opacity {
NumberAnimation { duration: 500 }
}
instead of
opacity: Behavior {
NumberAnimation { duration: 500 }
}
Diffstat (limited to 'src/declarative/qml/parser/qdeclarativejsast_p.h')
-rw-r--r-- | src/declarative/qml/parser/qdeclarativejsast_p.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/declarative/qml/parser/qdeclarativejsast_p.h b/src/declarative/qml/parser/qdeclarativejsast_p.h index 0a83fe2..c1945ce 100644 --- a/src/declarative/qml/parser/qdeclarativejsast_p.h +++ b/src/declarative/qml/parser/qdeclarativejsast_p.h @@ -2599,11 +2599,17 @@ public: UiObjectInitializer *initializer) : qualifiedId(qualifiedId), qualifiedTypeNameId(qualifiedTypeNameId), - initializer(initializer) + initializer(initializer), + hasOnToken(false) { kind = K; } virtual SourceLocation firstSourceLocation() const - { return qualifiedId->identifierToken; } + { + if (hasOnToken && qualifiedTypeNameId) + return qualifiedTypeNameId->identifierToken; + + return qualifiedId->identifierToken; + } virtual SourceLocation lastSourceLocation() const { return initializer->rbraceToken; } @@ -2615,6 +2621,7 @@ public: UiQualifiedId *qualifiedTypeNameId; UiObjectInitializer *initializer; SourceLocation colonToken; + bool hasOnToken; }; class QML_PARSER_EXPORT UiScriptBinding: public UiObjectMember |