From b25b3a9f8bee10d490d3160d1fb28bf0013c8e0b Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@nokia.com>
Date: Sat, 12 May 2012 03:33:50 +0200
Subject: Avoid using iconv for text conversion where possible

Try to use a builtin codec as codecForLocale() if possible
first. Fall back and instantiate the iconv codec only
if that failed.

In addition, make sure we initialize the locale correctly
before we try to setup the codec.

Change-Id: I86d635f9d11e8ff93093f162e79fb37f3d85731b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/kernel/qcoreapplication_p.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/corelib/kernel/qcoreapplication_p.h')

diff --git a/src/corelib/kernel/qcoreapplication_p.h b/src/corelib/kernel/qcoreapplication_p.h
index 112b313129..15aca398b7 100644
--- a/src/corelib/kernel/qcoreapplication_p.h
+++ b/src/corelib/kernel/qcoreapplication_p.h
@@ -89,6 +89,8 @@ public:
     static QString macMenuBarName();
 #endif
 
+    static void initLocale();
+
     QAtomicInt quitLockRef;
     void ref();
     void deref();
-- 
cgit v1.2.3