diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-12-14 18:55:43 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-12-14 18:55:43 (GMT) |
| commit | a068f6dd6115b2f950892e5228efe10b7de57a00 (patch) | |
| tree | c55c44b2e1b452838a7443d85ca2463ca1ec15bd /src/script/api/qscriptengine.cpp | |
| parent | ad4ca2152c161f7023e5febcf9e90c0652b8e57d (diff) | |
| parent | adba8e01f0069d240bf0b97175f54e38271acd19 (diff) | |
| download | Qt-a068f6dd6115b2f950892e5228efe10b7de57a00.zip Qt-a068f6dd6115b2f950892e5228efe10b7de57a00.tar.gz Qt-a068f6dd6115b2f950892e5228efe10b7de57a00.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
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 |