Use ICU instead of iconv/windows codecs for the locale

With ICU there's no need to use the windows locale or iconv
codecs anymore as locale codecs.

Change-Id: I50c94a97ed6acbf4c6f05b2a88593a57ebfa8342
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

1 files changed, 21 insertions, 21 deletions

diff --git a/src/corelib/codecs/codecs.pri b/src/corelib/codecs/codecs.pri
index d049e52275..0b40f795ad 100644
--- a/src/corelib/codecs/codecs.pri
+++ b/src/corelib/codecs/codecs.pri
@@ -39,26 +39,26 @@ contains(QT_CONFIG,icu) {
         codecs/qsjiscodec.cpp \
         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
-        }
-} else {
-    DEFINES += QT_NO_ICONV
-}
-win32 {
-    SOURCES += codecs/qwindowscodec.cpp
-    HEADERS += codecs/qwindowscodec_p.h
+    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
+            }
+    } else {
+        DEFINES += QT_NO_ICONV
+    }
+    win32 {
+        SOURCES += codecs/qwindowscodec.cpp
+        HEADERS += codecs/qwindowscodec_p.h
+    }
 }