Modernize the "textcodec" feature

Also clean up QTextCodec usage in qmake build and some includes
of qtextcodec.h.

Change-Id: I0475b82690024054add4e85a8724c8ea3adcf62a
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>

1 files changed, 47 insertions, 41 deletions

diff --git a/src/corelib/codecs/codecs.pri b/src/corelib/codecs/codecs.pri
index d86d446c72..f1bbde1d69 100644
--- a/src/corelib/codecs/codecs.pri
+++ b/src/corelib/codecs/codecs.pri
@@ -1,62 +1,68 @@
 # Qt core library codecs module
 
 HEADERS += \
-    codecs/qlatincodec_p.h \
-    codecs/qsimplecodec_p.h \
     codecs/qtextcodec_p.h \
-    codecs/qtextcodec.h \
     codecs/qutfcodec_p.h
 
 SOURCES += \
-    codecs/qlatincodec.cpp \
-    codecs/qsimplecodec.cpp \
-    codecs/qtextcodec.cpp \
     codecs/qutfcodec.cpp
 
-qtConfig(codecs) {
+qtConfig(textcodec) {
     HEADERS += \
-        codecs/qisciicodec_p.h \
-        codecs/qtsciicodec_p.h
+        codecs/qlatincodec_p.h \
+        codecs/qsimplecodec_p.h \
+        codecs/qtextcodec.h
 
     SOURCES += \
-        codecs/qisciicodec.cpp \
-        codecs/qtsciicodec.cpp
-}
+        codecs/qlatincodec.cpp \
+        codecs/qsimplecodec.cpp \
+        codecs/qtextcodec.cpp
 
-qtConfig(icu) {
-    HEADERS += \
-        codecs/qicucodec_p.h
-    SOURCES += \
-        codecs/qicucodec.cpp
-} else {
-    qtConfig(big_codecs) {
+    qtConfig(codecs) {
         HEADERS += \
-            codecs/qgb18030codec_p.h \
-            codecs/qeucjpcodec_p.h \
-            codecs/qjiscodec_p.h \
-            codecs/qsjiscodec_p.h \
-            codecs/qeuckrcodec_p.h \
-            codecs/qbig5codec_p.h
+            codecs/qisciicodec_p.h \
+            codecs/qtsciicodec_p.h
 
         SOURCES += \
-            codecs/qgb18030codec.cpp \
-            codecs/qjpunicode.cpp \
-            codecs/qeucjpcodec.cpp \
-            codecs/qjiscodec.cpp \
-            codecs/qsjiscodec.cpp \
-            codecs/qeuckrcodec.cpp \
-            codecs/qbig5codec.cpp
+            codecs/qisciicodec.cpp \
+            codecs/qtsciicodec.cpp
     }
 
-    qtConfig(iconv) {
-        HEADERS += codecs/qiconvcodec_p.h
-        SOURCES += codecs/qiconvcodec.cpp
-        qtConfig(gnu-libiconv): \
-            QMAKE_USE_PRIVATE += iconv
-    }
+    qtConfig(icu) {
+        HEADERS += \
+            codecs/qicucodec_p.h
+        SOURCES += \
+            codecs/qicucodec.cpp
+    } else {
+        qtConfig(big_codecs) {
+            HEADERS += \
+                codecs/qgb18030codec_p.h \
+                codecs/qeucjpcodec_p.h \
+                codecs/qjiscodec_p.h \
+                codecs/qsjiscodec_p.h \
+                codecs/qeuckrcodec_p.h \
+                codecs/qbig5codec_p.h
+
+            SOURCES += \
+                codecs/qgb18030codec.cpp \
+                codecs/qjpunicode.cpp \
+                codecs/qeucjpcodec.cpp \
+                codecs/qjiscodec.cpp \
+                codecs/qsjiscodec.cpp \
+                codecs/qeuckrcodec.cpp \
+                codecs/qbig5codec.cpp
+        }
+
+        qtConfig(iconv) {
+            HEADERS += codecs/qiconvcodec_p.h
+            SOURCES += codecs/qiconvcodec.cpp
+            qtConfig(gnu-libiconv): \
+                QMAKE_USE_PRIVATE += iconv
+        }
 
-    win32 {
-        SOURCES += codecs/qwindowscodec.cpp
-        HEADERS += codecs/qwindowscodec_p.h
+        win32 {
+            SOURCES += codecs/qwindowscodec.cpp
+            HEADERS += codecs/qwindowscodec_p.h
+        }
     }
 }