4 files changed, 19 insertions, 22 deletions

diff --git a/src/corelib/codecs/codecs.pri b/src/corelib/codecs/codecs.pri
index bfb677e6fb..fdaec33c5a 100644
--- a/src/corelib/codecs/codecs.pri
+++ b/src/corelib/codecs/codecs.pri
@@ -40,20 +40,17 @@ contains(QT_CONFIG,icu) {
         codecs/qeuckrcodec.cpp \
         codecs/qbig5codec.cpp
 
-    unix:!qnx:!mac:!ios:!linux-android-* {
-            contains(QT_CONFIG,iconv) {
-                    HEADERS += codecs/qiconvcodec_p.h
-                    SOURCES += codecs/qiconvcodec.cpp
-            } else:contains(QT_CONFIG,gnu-libiconv) {
-                    HEADERS += codecs/qiconvcodec_p.h
-                    SOURCES += codecs/qiconvcodec.cpp
-                    DEFINES += GNU_LIBICONV
-                    LIBS_PRIVATE *= -liconv
-            } else:contains(QT_CONFIG,sun-libiconv) {
-                    HEADERS += codecs/qiconvcodec_p.h
-                    SOURCES += codecs/qiconvcodec.cpp
-                    DEFINES += GNU_LIBICONV
+    unix:!qnx:!darwin:!linux-android-* {
+        contains(QT_CONFIG, iconv) {
+            HEADERS += codecs/qiconvcodec_p.h
+            SOURCES += codecs/qiconvcodec.cpp
+            contains(QT_CONFIG, gnu-libiconv) {
+                DEFINES += GNU_LIBICONV
+                LIBS_PRIVATE *= -liconv
+            } else: contains(QT_CONFIG, sun-libiconv) {
+                DEFINES += GNU_LIBICONV
             }
+        }
     } else:!win32-msvc* {
         DEFINES += QT_NO_ICONV
     }
diff --git a/src/corelib/codecs/qicucodec.cpp b/src/corelib/codecs/qicucodec.cpp
index aa2095d9da..ee9f1d0048 100644
--- a/src/corelib/codecs/qicucodec.cpp
+++ b/src/corelib/codecs/qicucodec.cpp
@@ -527,7 +527,7 @@ QTextCodec *QIcuCodec::codecForNameUnlocked(const char *name)
     // check whether there is really a converter for the name available.
     UConverter *conv = ucnv_open(standardName, &error);
     if (!conv) {
-        qDebug() << "codecForName: ucnv_open failed" << standardName << u_errorName(error);
+        qDebug("codecForName: ucnv_open failed %s %s", standardName, u_errorName(error));
         return 0;
     }
     //qDebug() << "QIcuCodec: Standard name for " << name << "is" << standardName;
@@ -577,7 +577,7 @@ UConverter *QIcuCodec::getConverter(QTextCodec::ConverterState *state) const
             ucnv_setSubstChars(static_cast<UConverter *>(state->d),
                                state->flags & QTextCodec::ConvertInvalidToNull ? "\0" : "?", 1, &error);
             if (U_FAILURE(error))
-                qDebug() << "getConverter(state) ucnv_open failed" << m_name << u_errorName(error);
+                qDebug("getConverter(state) ucnv_open failed %s %s", m_name, u_errorName(error));
         }
         conv = static_cast<UConverter *>(state->d);
     }
@@ -587,7 +587,7 @@ UConverter *QIcuCodec::getConverter(QTextCodec::ConverterState *state) const
         conv = ucnv_open(m_name, &error);
         ucnv_setSubstChars(conv, "?", 1, &error);
         if (U_FAILURE(error))
-            qDebug() << "getConverter(no state) ucnv_open failed" << m_name << u_errorName(error);
+            qDebug("getConverter(no state) ucnv_open failed %s %s", m_name, u_errorName(error));
     }
     return conv;
 }
@@ -610,7 +610,7 @@ QString QIcuCodec::convertToUnicode(const char *chars, int length, QTextCodec::C
                        &chars, end,
                        0, false, &error);
         if (!U_SUCCESS(error) && error != U_BUFFER_OVERFLOW_ERROR) {
-            qDebug() << "convertToUnicode failed:" << u_errorName(error);
+            qDebug("convertToUnicode failed: %s", u_errorName(error));
             break;
         }
 
@@ -647,7 +647,7 @@ QByteArray QIcuCodec::convertFromUnicode(const QChar *unicode, int length, QText
                          &uc, end,
                          0, false, &error);
         if (!U_SUCCESS(error))
-            qDebug() << "convertFromUnicode failed:" << u_errorName(error);
+            qDebug("convertFromUnicode failed: %s", u_errorName(error));
         convertedChars = ch - string.data();
         if (uc >= end)
             break;
diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp
index edb03af447..5098ac4242 100644
--- a/src/corelib/codecs/qtextcodec.cpp
+++ b/src/corelib/codecs/qtextcodec.cpp
@@ -132,7 +132,7 @@ bool qTextCodecNameMatch(const char *n, const char *h)
 }
 
 
-#if !defined(Q_OS_WIN32) && !defined(Q_OS_WINCE) && !defined(QT_LOCALE_IS_UTF8)
+#if !defined(Q_OS_WIN32) && !defined(QT_LOCALE_IS_UTF8)
 static QTextCodec *checkForCodec(const QByteArray &name) {
     QTextCodec *c = QTextCodec::codecForName(name);
     if (!c) {
@@ -169,7 +169,7 @@ static QTextCodec *setupLocaleMapper()
 
 #if defined(QT_LOCALE_IS_UTF8)
     locale = QTextCodec::codecForName("UTF-8");
-#elif defined(Q_OS_WIN) || defined(Q_OS_WINCE)
+#elif defined(Q_OS_WIN)
     locale = QTextCodec::codecForName("System");
 #else
 
@@ -289,7 +289,7 @@ static void setup()
 #if !defined(QT_NO_ICONV)
     (void) new QIconvCodec;
 #endif
-#if defined(Q_OS_WIN32) || defined(Q_OS_WINCE)
+#if defined(Q_OS_WIN32)
     (void) new QWindowsLocalCodec;
 #endif // Q_OS_WIN32
 #endif // !QT_NO_CODECS && !QT_BOOTSTRAPPED
diff --git a/src/corelib/codecs/qwindowscodec.cpp b/src/corelib/codecs/qwindowscodec.cpp
index b802ab7249..813d3c8153 100644
--- a/src/corelib/codecs/qwindowscodec.cpp
+++ b/src/corelib/codecs/qwindowscodec.cpp
@@ -157,7 +157,7 @@ QString QWindowsLocalCodec::convertToUnicodeCharByChar(const char *chars, int le
         state->remainingChars = 0;
     }
     const char *mb = mbcs;
-#if !defined(Q_OS_WINCE) && !defined(Q_OS_WINRT)
+#if !defined(Q_OS_WINRT)
     const char *next = 0;
     QString s;
     while ((next = CharNextExA(CP_ACP, mb, 0)) != mb) {