aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar.sletta@nokia.com>2012-03-07 10:21:08 +0100
committerQt by Nokia <qt-info@nokia.com>2012-03-07 13:14:52 +0100
commita85e66be34232fa17339562f0c2b51eca3f4c836 (patch)
treec807e68693cd19fae588af83971d3ccaf932b812 /src
parentee9cac7c3ad25e1e54286bb1b307bd3373383263 (diff)
Compile after API changes in QCoreApplication
Change-Id: I6bc6978a5c68503facd8085bd35e66f86af58a90 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/qml/qml/v8/qqmlbuiltinfunctions.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
index 7d7aaa2148..951bcc5ad3 100644
--- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
+++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
@@ -1188,9 +1188,7 @@ v8::Handle<v8::Value> qsTranslate(const v8::Arguments &args)
QCoreApplication::Encoding encoding = QCoreApplication::UnicodeUTF8;
if (args.Length() > 3) {
QString encStr = v8engine->toString(args[3]);
- if (encStr == QLatin1String("CodecForTr")) {
- encoding = QCoreApplication::CodecForTr;
- } else if (encStr == QLatin1String("UnicodeUTF8")) {
+ if (encStr == QLatin1String("UnicodeUTF8")) {
encoding = QCoreApplication::UnicodeUTF8;
} else {
QString msg = QString::fromLatin1("qsTranslate(): invalid encoding '%0'").arg(encStr);