diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-10-26 05:57:11 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-10-26 05:57:11 (GMT) |
| commit | de892b03e4d1ec11215c2817578415be311eab29 (patch) | |
| tree | c198ef98ab676ee6f99ea9e0fd400e6479316b69 | |
| parent | b51b792145ce18e9489630e5d0f0dba9d385393f (diff) | |
| download | Qt-de892b03e4d1ec11215c2817578415be311eab29.zip Qt-de892b03e4d1ec11215c2817578415be311eab29.tar.gz Qt-de892b03e4d1ec11215c2817578415be311eab29.tar.bz2 | |
Use QScriptProgram under windows
| -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 e3ac5bf..3b89a23 100644 --- a/src/declarative/qml/qmlexpression.cpp +++ b/src/declarative/qml/qmlexpression.cpp @@ -110,7 +110,7 @@ void QmlExpressionPrivate::init(QmlContext *ctxt, void *expr, QmlRefCount *rc, QmlEngine *engine = ctxt->engine(); QmlEnginePrivate *ep = QmlEnginePrivate::get(engine); QScriptEngine *scriptEngine = QmlEnginePrivate::getScriptEngine(engine); -#if !defined(Q_OS_SYMBIAN) && !defined(Q_OS_WIN32) //XXX Why doesn't this work? +#if !defined(Q_OS_SYMBIAN) //XXX Why doesn't this work? if (!dd->programs.at(progIdx)) { dd->programs[progIdx] = new QScriptProgram(data->expression, data->fileName, data->line); @@ -120,7 +120,7 @@ void QmlExpressionPrivate::init(QmlContext *ctxt, void *expr, QmlRefCount *rc, QScriptContext *scriptContext = scriptEngine->pushCleanContext(); scriptContext->pushScope(ep->contextClass->newContext(ctxt, me)); -#if !defined(Q_OS_SYMBIAN) && !defined(Q_OS_WIN32) +#if !defined(Q_OS_SYMBIAN) data->expressionFunction = scriptEngine->evaluate(*dd->programs[progIdx]); #else data->expressionFunction = scriptEngine->evaluate(data->expression); |