diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2009-12-09 16:50:49 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2009-12-09 16:50:49 (GMT) |
| commit | d1fa2391bf53e43e1952c6722e2525cc947557f2 (patch) | |
| tree | db5c77b6d783663bac8180a9c2e6f2ee301c401a /src/script/api/qscriptengine.cpp | |
| parent | f9357b1a6494fea60b822f2b154bbf4f2ab20270 (diff) | |
| parent | 528f822012bab0126c6c51d00632f03f3d3afb9c (diff) | |
| download | Qt-d1fa2391bf53e43e1952c6722e2525cc947557f2.zip Qt-d1fa2391bf53e43e1952c6722e2525cc947557f2.tar.gz Qt-d1fa2391bf53e43e1952c6722e2525cc947557f2.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of 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 |