diff options
| author | Bea Lam <bea.lam@nokia.com> | 2009-10-14 04:35:35 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2009-10-14 04:35:35 (GMT) |
| commit | b57d6c247215aa5b1d78cb1ca72b794012113d00 (patch) | |
| tree | d82ffdd097eb5a754ad2b62e9ea627071fb0f588 /src/declarative/qml/qmlbasicscript.cpp | |
| parent | f303d6e3a44de30b9b1dc869c9a54c60cb383f8a (diff) | |
| parent | 513cc4be0bec4a5fb303062ecbecf87708dc0e9b (diff) | |
| download | Qt-b57d6c247215aa5b1d78cb1ca72b794012113d00.zip Qt-b57d6c247215aa5b1d78cb1ca72b794012113d00.tar.gz Qt-b57d6c247215aa5b1d78cb1ca72b794012113d00.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/qmlbasicscript.cpp')
| -rw-r--r-- | src/declarative/qml/qmlbasicscript.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/declarative/qml/qmlbasicscript.cpp b/src/declarative/qml/qmlbasicscript.cpp index f3f9289..a0d749f 100644 --- a/src/declarative/qml/qmlbasicscript.cpp +++ b/src/declarative/qml/qmlbasicscript.cpp @@ -52,6 +52,8 @@ QT_BEGIN_NAMESPACE +DEFINE_BOOL_CONFIG_OPTION(qmlBasicScriptDump, QML_BASICSCRIPT_DUMP); + using namespace QmlJS; struct ScriptInstruction { @@ -367,7 +369,7 @@ bool QmlBasicScript::compile(const Expression &expression) { if (!expression.expression.asAST()) return false; - QByteArray expr = expression.expression.asScript().toLatin1(); + QByteArray expr = expression.expression.asScript().toUtf8(); const char *src = expr.constData(); QmlBasicScriptCompiler bsc; @@ -400,6 +402,8 @@ bool QmlBasicScript::compile(const Expression &expression) ::memcpy((char *)d->data(), bsc.data.constData(), bsc.data.count()); } + if (d && qmlBasicScriptDump()) + dump(); return d != 0; } @@ -649,7 +653,7 @@ QVariant QmlBasicScript::run(QmlContext *context, QObject *me) case ScriptInstruction::FetchRootConstant: { - QObject *obj = contextPrivate->defaultObjects.at(0); + QObject *obj = contextPrivate->defaultObjects.last(); stack.push(fetch_value(obj, instr.constant.idx, instr.constant.type)); if (obj && instr.constant.notify != 0) |