summaryrefslogtreecommitdiff
path: root/src/declarative/qml/parser/qdeclarativejslexer.cpp
diff options
context:
space:
mode:
authorRoberto Raggi <roberto.raggi@nokia.com>2010-02-25 10:34:28 +0100
committerRoberto Raggi <roberto.raggi@nokia.com>2010-02-25 10:34:28 +0100
commit0e4dd15a90c119cea4ada833d88b51e336f53ee7 (patch)
tree86eef14fe41bc50e0f638e91227e5ad96a5181de /src/declarative/qml/parser/qdeclarativejslexer.cpp
parent75d61cbd7d2c72abb1fcf486c97bbb7429aea81b (diff)
downloadqt4-tools-0e4dd15a90c119cea4ada833d88b51e336f53ee7.tar.gz
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/qdeclarativejslexer.cpp')
-rw-r--r--src/declarative/qml/parser/qdeclarativejslexer.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/qml/parser/qdeclarativejslexer.cpp b/src/declarative/qml/parser/qdeclarativejslexer.cpp
index 384d00c98d..34163a4c98 100644
--- a/src/declarative/qml/parser/qdeclarativejslexer.cpp
+++ b/src/declarative/qml/parser/qdeclarativejslexer.cpp
@@ -166,6 +166,8 @@ int Lexer::findReservedWord(const QChar *c, int size) const
return QDeclarativeJSGrammar::T_IN;
else if (c[0] == QLatin1Char('a') && c[1] == QLatin1Char('s'))
return QDeclarativeJSGrammar::T_AS;
+ else if (c[0] == QLatin1Char('o') && c[1] == QLatin1Char('n'))
+ return QDeclarativeJSGrammar::T_ON;
} break;
case 3: {