diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-03-02 00:47:10 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-03-02 00:47:10 (GMT) |
commit | 2790cb59f6877c1027c833578b72e168c912758a (patch) | |
tree | b626316b5801ba887b48e9fe71f811f4cf4ec581 /src/declarative/qml/qdeclarativeparser.cpp | |
parent | f800919c4336da77b73561cc5180fc167f61f435 (diff) | |
download | Qt-2790cb59f6877c1027c833578b72e168c912758a.zip Qt-2790cb59f6877c1027c833578b72e168c912758a.tar.gz Qt-2790cb59f6877c1027c833578b72e168c912758a.tar.bz2 |
Make "on" syntax mandatory for value sources and interceptors
Where you would have written
x: NumberAnimation {}
y: Behavior {}
you now must write
NumberAnimation on x {}
Behavior on y {}
This change also makes the parser more strict with respect to multiple
assignments to a single property - they're no longer allowed. For example
this
x: 10
x: 11
is now an error.
Diffstat (limited to 'src/declarative/qml/qdeclarativeparser.cpp')
-rw-r--r-- | src/declarative/qml/qdeclarativeparser.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeparser.cpp b/src/declarative/qml/qdeclarativeparser.cpp index 5ac49d5..0e3d856 100644 --- a/src/declarative/qml/qdeclarativeparser.cpp +++ b/src/declarative/qml/qdeclarativeparser.cpp @@ -221,6 +221,8 @@ QDeclarativeParser::Property::~Property() { foreach(Value *value, values) value->release(); + foreach(Value *value, onValues) + value->release(); if (value) value->release(); } @@ -235,9 +237,14 @@ void QDeclarativeParser::Property::addValue(Value *v) values << v; } +void QDeclarativeParser::Property::addOnValue(Value *v) +{ + onValues << v; +} + bool QDeclarativeParser::Property::isEmpty() const { - return !value && values.isEmpty(); + return !value && values.isEmpty() && onValues.isEmpty(); } QDeclarativeParser::Value::Value() |