use iconv codec as fallback, not default

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/core/codecs/qtextcodec.cpp b/src/core/codecs/qtextcodec.cpp
index a95ad38..2729679 100644 (file)
--- a/src/core/codecs/qtextcodec.cpp
+++ b/src/core/codecs/qtextcodec.cpp
@@ -311,10 +311,6 @@ static QTextCodec *checkForCodec(const QByteArray &name) {
 */
 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);
@@ -420,10 +416,15 @@ static void setupLocaleMapper()
 
     }
 
+#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