From 7968543bb0308395226a8847274dc3b836dd7b87 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@nokia.com>
Date: Thu, 17 May 2012 02:37:23 +0200
Subject: Don't use the deprecated translate() method anymore

The Encoding argument of QCoreApplication::translate()
is deprecated and source code is always assumed to be
encoded in Utf8. Simply remove the encoding argument
from the generated .ui.h files.

Change-Id: If6c40f6df13abd45a0303c863077972c3d1fb685
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/tools/uic/cpp/cppwriteinitialization.cpp | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'src/tools/uic/cpp/cppwriteinitialization.cpp')

diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp
index 88636f4161f..e5eda7840d7 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.cpp
+++ b/src/tools/uic/cpp/cppwriteinitialization.cpp
@@ -2316,11 +2316,6 @@ QString WriteInitialization::trCall(const QString &str, const QString &commentHi
     result += QLatin1String(", ");
     result += comment;
 
-    if (m_option.translateFunction.isEmpty()) {
-        result += QLatin1String(", ");
-        result += QLatin1String("QApplication::UnicodeUTF8");
-    }
-
     result += QLatin1Char(')');
     return result;
 }
-- 
cgit v1.2.3