diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-13 14:16:55 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-13 14:16:55 (GMT) |
| commit | 4f3a6db62f3692996cb5e69d5b79c33c397aa506 (patch) | |
| tree | 54087e5fd5c1e4eb289979acc75a16dbe77887e8 /src/script/api/qscriptengine.cpp | |
| parent | b1906f053ec1a9c90c4df1870568e3036fae6b9b (diff) | |
| parent | 11f61a9c413352e01fd2180250aa3fb09e1b4ac9 (diff) | |
| download | Qt-4f3a6db62f3692996cb5e69d5b79c33c397aa506.zip Qt-4f3a6db62f3692996cb5e69d5b79c33c397aa506.tar.gz Qt-4f3a6db62f3692996cb5e69d5b79c33c397aa506.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into qt-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Add benchmark for QtScript translation functions.
Fix translation context for qsTr.
Put symbian-specific test inside symbian qmake scope.
Remove this unnecessary and verbose line.
Proper fix for QTBUG-6421
fix -nomake tools configure option for Windows CE / Symbian
Compilation fix for Windows Mobile
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 |