diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-10-26 02:57:20 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-10-26 03:28:45 (GMT) |
| commit | b51b792145ce18e9489630e5d0f0dba9d385393f (patch) | |
| tree | df69affe1abdf6fe70d5a296f8fe837442b985c3 /src/declarative/qml/qmlexpression.cpp | |
| parent | 05d3e827565d635e75cfd49e46b3ba72903a1e6f (diff) | |
| parent | 6cd67bb07271950cca86dcad764b8581da588a51 (diff) | |
| download | Qt-b51b792145ce18e9489630e5d0f0dba9d385393f.zip Qt-b51b792145ce18e9489630e5d0f0dba9d385393f.tar.gz Qt-b51b792145ce18e9489630e5d0f0dba9d385393f.tar.bz2 | |
Merge branch 'qscriptprogram' of git@scm.dev.nokia.troll.no:qt/khansens-qt-script-program into kinetic-declarativeui
Manually merged src/declarative/qml/qmlexpression.cpp
src/script/api/qscriptengine.cpp
src/script/api/qscriptengine.h
Diffstat (limited to 'src/declarative/qml/qmlexpression.cpp')
| -rw-r--r-- | src/declarative/qml/qmlexpression.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlexpression.cpp b/src/declarative/qml/qmlexpression.cpp index 3f531a3..e3ac5bf 100644 --- a/src/declarative/qml/qmlexpression.cpp +++ b/src/declarative/qml/qmlexpression.cpp @@ -46,6 +46,7 @@ #include "qmlrewrite_p.h" #include "QtCore/qdebug.h" #include "qmlcompiler_p.h" +#include <QtScript/qscriptprogram.h> Q_DECLARE_METATYPE(QList<QObject *>); @@ -112,7 +113,7 @@ void QmlExpressionPrivate::init(QmlContext *ctxt, void *expr, QmlRefCount *rc, #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)); + new QScriptProgram(data->expression, data->fileName, data->line); } #endif |