diff options
| author | Michael Brasser <[email protected]> | 2011-07-29 10:13:56 +1000 |
|---|---|---|
| committer | Qt by Nokia <[email protected]> | 2011-07-29 09:23:01 +0200 |
| commit | ee000c3ef1288b83b7b8e2c9baa033075c05c68a (patch) | |
| tree | 65cefca66680a177a34ecf403783536e484d5409 /src/script/api/qscriptengine.cpp | |
| parent | 3f515dcae3d5e4cd5571d3ae054fc64fc57e3c96 (diff) | |
Fix translation context for QML files in a QRC.
Task-number: QTBUG-17255
Change-Id: Id4685f2531af1113947c55184870e3b3cd874c32
Reviewed-on: http://codereview.qt.nokia.com/2355
Reviewed-by: Qt Sanity Bot <[email protected]>
Reviewed-by: Kent Hansen <[email protected]>
Diffstat (limited to 'src/script/api/qscriptengine.cpp')
| -rw-r--r-- | src/script/api/qscriptengine.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index cbf48a9..f4a9a0d 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -3398,7 +3398,12 @@ bool QScriptEnginePrivate::hasDemarshalFunction(int type) const JSC::UString QScriptEnginePrivate::translationContextFromUrl(const JSC::UString &url) { if (url != cachedTranslationUrl) { - cachedTranslationContext = QFileInfo(url).baseName(); + const QString &baseName = QFileInfo(url).baseName(); + if (baseName.startsWith(QLatin1String("qrc:"), Qt::CaseInsensitive)) + cachedTranslationContext = baseName.mid(4); + else + cachedTranslationContext = baseName; + cachedTranslationUrl = url; } return cachedTranslationContext; |