diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-03-03 22:58:25 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-03-03 22:58:25 (GMT) |
| commit | 42b58d2b6971962c3117091c4727e71b22a41707 (patch) | |
| tree | f7cc50d2b45d024ea1dda017c1952a8ef3d78df7 /src/declarative/qml/qdeclarativedom.cpp | |
| parent | 24c1173aac92e9a4e14da072b5aa62c8289d810d (diff) | |
| parent | 5ac068602871b78eb4b58634d58e6b8898acbf8d (diff) | |
| download | Qt-42b58d2b6971962c3117091c4727e71b22a41707.zip Qt-42b58d2b6971962c3117091c4727e71b22a41707.tar.gz Qt-42b58d2b6971962c3117091c4727e71b22a41707.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/qml/qdeclarativedom.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativedom.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/declarative/qml/qdeclarativedom.cpp b/src/declarative/qml/qdeclarativedom.cpp index 5b43109..cb56ead 100644 --- a/src/declarative/qml/qdeclarativedom.cpp +++ b/src/declarative/qml/qdeclarativedom.cpp @@ -374,7 +374,7 @@ QDeclarativeDomValue QDeclarativeDomProperty::value() const QDeclarativeDomValue rv; if (d->property) { rv.d->property = d->property; - if (d->property->values.count()) + if (d->property->values.count()) rv.d->value = d->property->values.at(0); else rv.d->value = d->property->onValues.at(0); @@ -508,7 +508,7 @@ int QDeclarativeDomDynamicProperty::propertyType() const QByteArray QDeclarativeDomDynamicProperty::propertyTypeName() const { - if (isValid()) + if (isValid()) return d->property.customType; return QByteArray(); @@ -1184,7 +1184,7 @@ QDeclarativeDomObject QDeclarativeDomValueValueSource::object() const \qml Rectangle { - x: Behavior { NumberAnimation { duration: 500 } } + Behavior on x { NumberAnimation { duration: 500 } } } \endqml */ @@ -1228,7 +1228,7 @@ QDeclarativeDomValueValueInterceptor &QDeclarativeDomValueValueInterceptor::oper returned. \qml Rectangle { - x: Behavior { NumberAnimation { duration: 500 } } + Behavior on x { NumberAnimation { duration: 500 } } } \endqml */ |