From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Mon, 21 May 2012 10:38:46 +0000 (+0200)
Subject: QtDeclarative: Fix warnings about deprecated QCoreApplication::translate().
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=f7323fcf1277268931bb336047e1186a20affcf6;p=konrad%2Fqtdeclarative.git

QtDeclarative: Fix warnings about deprecated QCoreApplication::translate().

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

diff --git a/src/qml/qml/qqmlvme.cpp b/src/qml/qml/qqmlvme.cpp
index 08ab494..b86e3be 100644
--- a/src/qml/qml/qqmlvme.cpp
+++ b/src/qml/qml/qqmlvme.cpp
@@ -402,7 +402,6 @@ QObject *QQmlVME::run(QList<QQmlError> *errors,
                         QCoreApplication::translate(DATAS.at(instr.context).constData(),
                                                     DATAS.at(instr.text).constData(),
                                                     DATAS.at(instr.comment).constData(),
-                                                    QCoreApplication::UnicodeUTF8,
                                                     instr.n));
         QML_STORE_VALUE(StoreTrIdString, QString, qtTrId(DATAS.at(instr.text).constData(), instr.n));
 
diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
index 26ecc93..dd5131f 100644
--- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
+++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
@@ -1210,7 +1210,7 @@ v8::Handle<v8::Value> qsTranslate(const v8::Arguments &args)
     QString result = QCoreApplication::translate(context.toUtf8().constData(),
                                                  text.toUtf8().constData(),
                                                  comment.toUtf8().constData(),
-                                                 QCoreApplication::UnicodeUTF8, n);
+                                                 n);
 
     return v8engine->toString(result);
 }
@@ -1249,7 +1249,7 @@ v8::Handle<v8::Value> qsTr(const v8::Arguments &args)
         n = args[2]->Int32Value();
 
     QString result = QCoreApplication::translate(context.toUtf8().constData(), text.toUtf8().constData(),
-                                                 comment.toUtf8().constData(), QCoreApplication::UnicodeUTF8, n);
+                                                 comment.toUtf8().constData(), n);
 
     return v8engine->toString(result);
 }