diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-10-22 01:55:51 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-10-22 01:55:51 (GMT) |
| commit | 9828be6deada6f6f12a822f7cdfd03f19ef57387 (patch) | |
| tree | d9683bcc3e97a9f7539fca42bf94bc6839400c26 /src/declarative/qml/qmlexpression.cpp | |
| parent | 7bd7f5ec6eb520b7d9940a24817b17132d9ed6a2 (diff) | |
| download | Qt-9828be6deada6f6f12a822f7cdfd03f19ef57387.zip Qt-9828be6deada6f6f12a822f7cdfd03f19ef57387.tar.gz Qt-9828be6deada6f6f12a822f7cdfd03f19ef57387.tar.bz2 | |
Compiled JS doesn't work on Win32
Diffstat (limited to 'src/declarative/qml/qmlexpression.cpp')
| -rw-r--r-- | src/declarative/qml/qmlexpression.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qmlexpression.cpp b/src/declarative/qml/qmlexpression.cpp index 356c3c6..cfa9469 100644 --- a/src/declarative/qml/qmlexpression.cpp +++ b/src/declarative/qml/qmlexpression.cpp @@ -109,7 +109,7 @@ void QmlExpressionPrivate::init(QmlContext *ctxt, void *expr, QmlRefCount *rc, QmlEngine *engine = ctxt->engine(); QmlEnginePrivate *ep = QmlEnginePrivate::get(engine); QScriptEngine *scriptEngine = QmlEnginePrivate::getScriptEngine(engine); -#ifndef Q_OS_SYMBIAN //XXX Why doesn't this work? +#if !defined(Q_OS_SYMBIAN) && !defined(Q_OS_WIN32) //XXX Why doesn't this work? if (!dd->programs.at(progIdx)) { dd->programs[progIdx] = new QScriptProgram(scriptEngine->compile(data->expression, data->fileName, data->line)); @@ -119,7 +119,7 @@ void QmlExpressionPrivate::init(QmlContext *ctxt, void *expr, QmlRefCount *rc, QScriptContext *scriptContext = scriptEngine->pushCleanContext(); scriptContext->pushScope(ep->contextClass->newContext(ctxt, me)); -#ifndef Q_OS_SYMBIAN +#if !defined(Q_OS_SYMBIAN) && !defined(Q_OS_WIN32) data->expressionFunction = scriptEngine->evaluate(*dd->programs[progIdx]); #else data->expressionFunction = scriptEngine->evaluate(data->expression); |