whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use utf-8 as the locale codec where it makes sense 

Use utf8 as the fallback codec in case we can't determine
something else instead of latin1.
Also use utf8 for Mac, iOS, Android and QNX.

Change-Id: I15dc85d2406b1ebdfacff25f45f8b6854c52b97e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Lars Knoll 2012-07-20 11:02:40 +02:00 committed by Qt by Nokia
parent e41129c859
commit d4510d0d31
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/corelib/codecs/qtextcodec.cpp
View File

@ -152,20 +152,23 @@ static QTextCodec *setupLocaleMapper()
// already setup
return globalData->codecForLocale;
#if defined(Q_OS_WIN32) || defined(Q_OS_WINCE)
globalData->codecForLocale = QTextCodec::codecForName("System");
#else
#if !defined(QT_BOOTSTRAPPED)
QCoreApplicationPrivate::initLocale();
#endif
#if defined(Q_OS_WIN) || defined(Q_OS_WINCE)
globalData->codecForLocale = QTextCodec::codecForName("System");
#elif defined(Q_OS_MAC) || defined(Q_OS_IOS) || defined(Q_OS_LINUX_ANDROID) || defined(Q_OS_QNX)
globalData->codecForLocale = QTextCodec::codecForName("UTF-8");
#else
// First try getting the codecs name from nl_langinfo and see
// if we have a builtin codec for it.
// Only fall back to using iconv if we can't find a builtin codec
// This is because the builtin utf8 codec is around 5 times faster
// then the using QIconvCodec
#if defined (_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF) && !defined(Q_OS_LINUX_ANDROID)
#if defined (_XOPEN_UNIX) && !defined(Q_OS_OSF)
char *charset = nl_langinfo(CODESET);
if (charset)
globalData->codecForLocale = QTextCodec::codecForName(charset);
@ -237,7 +240,6 @@ static QTextCodec *setupLocaleMapper()
}
// If everything failed, we default to 8859-1
// We could perhaps default to 8859-15.
if (!globalData->codecForLocale)
globalData->codecForLocale = QTextCodec::codecForName("ISO 8859-1");
#endif