From: Gunnar Sletta <gunnar.sletta@nokia.com>
Date: Wed, 7 Mar 2012 09:21:08 +0000 (+0100)
Subject: Compile after API changes in QCoreApplication
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=a85e66be34232fa17339562f0c2b51eca3f4c836;p=konrad%2Fqtdeclarative.git

Compile after API changes in QCoreApplication

Change-Id: I6bc6978a5c68503facd8085bd35e66f86af58a90
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
---

diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
index 7d7aaa2..951bcc5 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);