diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-05-12 03:33:50 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-16 04:25:14 +0200 |
| commit | b25b3a9f8bee10d490d3160d1fb28bf0013c8e0b (patch) | |
| tree | 0dc6ece26193cbc111789f639e7f8ac78796f4be /src/corelib/kernel/qcoreapplication_p.h | |
| parent | 1756a84756807a9849aa507e77845dfdf31b8020 (diff) | |
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>
Diffstat (limited to 'src/corelib/kernel/qcoreapplication_p.h')
| -rw-r--r-- | src/corelib/kernel/qcoreapplication_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
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(); |