diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2009-08-27 05:18:09 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2009-08-27 05:18:09 (GMT) |
| commit | 648fa4818d875ec76c304b79e474a406d265bd0f (patch) | |
| tree | 59ff18a98eaa7b5852816195e09d4b31cab134bf /src/declarative/qml | |
| parent | fd2616977e5e03afa3be9b455bc0a6be19f9132f (diff) | |
| parent | 30f011823f0acacdfb3380a6ae52f05e2c8cdd6a (diff) | |
| download | Qt-648fa4818d875ec76c304b79e474a406d265bd0f.zip Qt-648fa4818d875ec76c304b79e474a406d265bd0f.tar.gz Qt-648fa4818d875ec76c304b79e474a406d265bd0f.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/qmlexpression.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 |