Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
*/
static void setupLocaleMapper()
{
-#ifndef QT_NO_ICONV
- localeMapper = QTextCodec::codecForName("System");
-#endif
-
#if defined (_XOPEN_UNIX) && !defined(Q_OS_OSF)
if (!localeMapper) {
char *charset = nl_langinfo (CODESET);
}
+#ifndef QT_NO_ICONV
+ if (!localeMapper)
+ localeMapper = QTextCodec::codecForName("System");
+#else
// If everything failed, we default to 8859-1
// We could perhaps default to 8859-15.
if (!localeMapper)
localeMapper = QTextCodec::codecForName("ISO 8859-1");
+#endif
}
#ifndef QT_NO_THREAD