summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2012-05-17 02:37:23 +0200
committerQt by Nokia <qt-info@nokia.com>2012-05-18 22:38:55 +0200
commit7968543bb0308395226a8847274dc3b836dd7b87 (patch)
tree9e449b49d0e2f271bdad50008954d735711a1606 /src
parent8df298665a1e637ab6d26d5fcc447d5502afe31a (diff)
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>
Diffstat (limited to 'src')
-rw-r--r--src/tools/uic/cpp/cppwriteinitialization.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp
index 88636f4161..e5eda7840d 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;
}