From ee000c3ef1288b83b7b8e2c9baa033075c05c68a Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Fri, 29 Jul 2011 10:13:56 +1000 Subject: 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 Reviewed-by: Kent Hansen --- src/script/api/qscriptengine.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/script/api/qscriptengine.cpp') 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; -- cgit v1.2.1