diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-08-05 05:11:41 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-08-05 05:11:41 (GMT) |
| commit | 2ee9d1cd0b7ee5b8973a286f56943a61350cdc67 (patch) | |
| tree | a476794114e42909897a6223e2cbd1787054e2ba /src/declarative/qml | |
| parent | 1ca575eaf7c166f823b82132110ea066be819540 (diff) | |
| parent | 563b5891e2f918f901ffefe29872dfac1b9a60e7 (diff) | |
| download | Qt-2ee9d1cd0b7ee5b8973a286f56943a61350cdc67.zip Qt-2ee9d1cd0b7ee5b8973a286f56943a61350cdc67.tar.gz Qt-2ee9d1cd0b7ee5b8973a286f56943a61350cdc67.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/qml')
| -rw-r--r-- | src/declarative/qml/qdeclarativeexpression.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/declarative/qml/qdeclarativeexpression.cpp b/src/declarative/qml/qdeclarativeexpression.cpp index 585fb69..6fc4df0 100644 --- a/src/declarative/qml/qdeclarativeexpression.cpp +++ b/src/declarative/qml/qdeclarativeexpression.cpp @@ -143,16 +143,12 @@ void QDeclarativeExpressionPrivate::init(QDeclarativeContextData *ctxt, void *ex } else { -#if !defined(Q_OS_SYMBIAN) //XXX Why doesn't this work? if (!dd->cachedPrograms.at(progIdx)) { dd->cachedPrograms[progIdx] = new QScriptProgram(expression, url, line); } expressionFunction = evalInObjectScope(ctxt, me, *dd->cachedPrograms.at(progIdx), &expressionContext); -#else - expressionFunction = evalInObjectScope(ctxt, me, expression, &expressionContext); -#endif expressionFunctionMode = ExplicitContext; expressionFunctionValid = true; |