diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-08-27 06:12:19 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-08-27 06:12:19 (GMT) |
| commit | 2d23a0659ebfa87e681e9540935eb54ea3785bfc (patch) | |
| tree | ca5d0c052a1e190bd959d4adcbe2cbca185e95fe /src/declarative/qml | |
| parent | 09c662b1c3440d7ff0b151d1fd10fc19ef75725f (diff) | |
| parent | 84ab1ebab17e62176db1120845d0a3ece5cf9d80 (diff) | |
| download | Qt-2d23a0659ebfa87e681e9540935eb54ea3785bfc.zip Qt-2d23a0659ebfa87e681e9540935eb54ea3785bfc.tar.gz Qt-2d23a0659ebfa87e681e9540935eb54ea3785bfc.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml')
| -rw-r--r-- | src/declarative/qml/qmlcompiler.cpp | 2 | ||||
| -rw-r--r-- | src/declarative/qml/qmlexpression.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp index f9183c8..764699e 100644 --- a/src/declarative/qml/qmlcompiler.cpp +++ b/src/declarative/qml/qmlcompiler.cpp @@ -1231,7 +1231,7 @@ bool QmlCompiler::buildProperty(QmlParser::Property *prop, if (!prop->isDefault && prop->name == "id" && !ctxt.isSubContext()) { - // The magic "id" behaviour doesn't apply when "id" is resolved as a + // The magic "id" behavior doesn't apply when "id" is resolved as a // default property or to sub-objects (which are always in binding // sub-contexts) COMPILE_CHECK(buildIdProperty(prop, obj)); diff --git a/src/declarative/qml/qmlexpression.cpp b/src/declarative/qml/qmlexpression.cpp index 77463cd..845dcf6 100644 --- a/src/declarative/qml/qmlexpression.cpp +++ b/src/declarative/qml/qmlexpression.cpp @@ -315,7 +315,7 @@ QVariant QmlExpression::value() Q_D(QmlExpression); QVariant rv; - if (!d->context() || (!d->sse.isValid() && d->expression.isEmpty())) + if (!engine() || (!d->sse.isValid() && d->expression.isEmpty())) return rv; #ifdef Q_ENABLE_PERFORMANCE_LOG |