diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-12-09 03:08:24 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-12-09 03:08:24 (GMT) |
| commit | 8586dcd39f821a3aca4b663a9b943061c8b2a125 (patch) | |
| tree | dbe54e183714ce1c9feabf9b957dabb069cab9a7 /src/script/api/qscriptengine.cpp | |
| parent | 0150b8ffd4e12ca0f3c5197ce225d81b0f9d1537 (diff) | |
| parent | f107c0d9dfe5c854c1235d34755bbf1de34c4cb4 (diff) | |
| download | Qt-8586dcd39f821a3aca4b663a9b943061c8b2a125.zip Qt-8586dcd39f821a3aca4b663a9b943061c8b2a125.tar.gz Qt-8586dcd39f821a3aca4b663a9b943061c8b2a125.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/script/api/qscriptengine.cpp')
| -rw-r--r-- | src/script/api/qscriptengine.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index b6aa872..1879367 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -33,6 +33,7 @@ #include "qscriptvalue_p.h" #include "qscriptvalueiterator.h" #include "qscriptclass.h" +#include "qscriptcontextinfo.h" #include "qscriptprogram.h" #include "qscriptprogram_p.h" #include "qdebug.h" @@ -698,9 +699,9 @@ JSC::JSValue JSC_HOST_CALL functionQsTr(JSC::ExecState *exec, JSC::JSObject*, JS return JSC::throwError(exec, JSC::GeneralError, "qsTranslate(): third argument (n) must be a number"); #ifndef QT_NO_QOBJECT QString context; -// ### implement context resolution -// if (ctx->parentContext()) -// context = QFileInfo(ctx->parentContext()->fileName()).baseName(); + QScriptContext *ctx = QScriptEnginePrivate::contextForFrame(exec); + if (ctx && ctx->parentContext()) + context = QFileInfo(QScriptContextInfo(ctx->parentContext()).fileName()).baseName(); #endif QString text(args.at(0).toString(exec)); #ifndef QT_NO_QOBJECT |