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>

14 files changed, 73 insertions, 84 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
+        }
     }
 }
diff --git a/src/corelib/codecs/qiconvcodec.cpp b/src/corelib/codecs/qiconvcodec.cpp
index 330eb7c038..9c39727946 100644
--- a/src/corelib/codecs/qiconvcodec.cpp
+++ b/src/corelib/codecs/qiconvcodec.cpp
@@ -39,8 +39,6 @@
 
 #include <QtCore/private/qglobal_p.h>
 
-QT_REQUIRE_CONFIG(iconv);
-
 #include "qiconvcodec_p.h"
 #include "qtextcodec_p.h"
 #include <qdebug.h>
diff --git a/src/corelib/codecs/qicucodec.cpp b/src/corelib/codecs/qicucodec.cpp
index 06a6d95e82..101c3a3278 100644
--- a/src/corelib/codecs/qicucodec.cpp
+++ b/src/corelib/codecs/qicucodec.cpp
@@ -39,8 +39,6 @@
 
 #include "qicucodec_p.h"
 
-#ifndef QT_NO_TEXTCODEC
-
 #include "qtextcodec_p.h"
 #include "qutfcodec_p.h"
 #include "qlatincodec_p.h"
@@ -698,5 +696,3 @@ int QIcuCodec::mibEnum() const
 }
 
 QT_END_NAMESPACE
-
-#endif // QT_NO_TEXTCODEC
diff --git a/src/corelib/codecs/qicucodec_p.h b/src/corelib/codecs/qicucodec_p.h
index 0c2dbe17d6..1cbe4d4e7a 100644
--- a/src/corelib/codecs/qicucodec_p.h
+++ b/src/corelib/codecs/qicucodec_p.h
@@ -59,9 +59,9 @@ extern "C" {
     typedef struct UConverter UConverter;
 }
 
-QT_BEGIN_NAMESPACE
+QT_REQUIRE_CONFIG(textcodec);
 
-#ifndef QT_NO_TEXTCODEC
+QT_BEGIN_NAMESPACE
 
 class QIcuCodec : public QTextCodec
 {
@@ -90,8 +90,6 @@ private:
     const char *m_name;
 };
 
-#endif // QT_NO_TEXTCODEC
-
 QT_END_NAMESPACE
 
 #endif
diff --git a/src/corelib/codecs/qlatincodec.cpp b/src/corelib/codecs/qlatincodec.cpp
index cfbd481f1e..1b53d26ef4 100644
--- a/src/corelib/codecs/qlatincodec.cpp
+++ b/src/corelib/codecs/qlatincodec.cpp
@@ -40,8 +40,6 @@
 #include "qlatincodec_p.h"
 #include "qlist.h"
 
-#ifndef QT_NO_TEXTCODEC
-
 QT_BEGIN_NAMESPACE
 
 QLatin1Codec::~QLatin1Codec()
@@ -238,5 +236,3 @@ int QLatin15Codec::mibEnum() const
 }
 
 QT_END_NAMESPACE
-
-#endif // QT_NO_TEXTCODEC
diff --git a/src/corelib/codecs/qlatincodec_p.h b/src/corelib/codecs/qlatincodec_p.h
index 3e258e5ae1..26f9e596a9 100644
--- a/src/corelib/codecs/qlatincodec_p.h
+++ b/src/corelib/codecs/qlatincodec_p.h
@@ -54,9 +54,9 @@
 #include <QtCore/private/qglobal_p.h>
 #include "QtCore/qtextcodec.h"
 
-QT_BEGIN_NAMESPACE
+QT_REQUIRE_CONFIG(textcodec);
 
-#ifndef QT_NO_TEXTCODEC
+QT_BEGIN_NAMESPACE
 
 class QLatin1Codec : public QTextCodec
 {
@@ -86,8 +86,6 @@ public:
     int mibEnum() const override;
 };
 
-#endif // QT_NO_TEXTCODEC
-
 QT_END_NAMESPACE
 
 #endif // QLATINCODEC_P_H
diff --git a/src/corelib/codecs/qsimplecodec.cpp b/src/corelib/codecs/qsimplecodec.cpp
index beb0a08f62..9ab545d783 100644
--- a/src/corelib/codecs/qsimplecodec.cpp
+++ b/src/corelib/codecs/qsimplecodec.cpp
@@ -40,8 +40,6 @@
 #include "qsimplecodec_p.h"
 #include "qlist.h"
 
-#ifndef QT_NO_TEXTCODEC
-
 QT_BEGIN_NAMESPACE
 
 #define LAST_MIB 2004
@@ -724,5 +722,3 @@ int QSimpleTextCodec::mibEnum() const
 }
 
 QT_END_NAMESPACE
-
-#endif // QT_NO_TEXTCODEC
diff --git a/src/corelib/codecs/qsimplecodec_p.h b/src/corelib/codecs/qsimplecodec_p.h
index 188c3f3cb4..a4b2a45e6b 100644
--- a/src/corelib/codecs/qsimplecodec_p.h
+++ b/src/corelib/codecs/qsimplecodec_p.h
@@ -54,9 +54,9 @@
 #include <QtCore/private/qglobal_p.h>
 #include "QtCore/qtextcodec.h"
 
-QT_BEGIN_NAMESPACE
+QT_REQUIRE_CONFIG(textcodec);
 
-#ifndef QT_NO_TEXTCODEC
+QT_BEGIN_NAMESPACE
 
 template <typename T> class QAtomicPointer;
 
@@ -79,8 +79,6 @@ private:
     mutable QAtomicPointer<QByteArray> reverseMap;
 };
 
-#endif // QT_NO_TEXTCODEC
-
 QT_END_NAMESPACE
 
 #endif // QSIMPLECODEC_P_H
diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp
index 790921610a..1ec443cd73 100644
--- a/src/corelib/codecs/qtextcodec.cpp
+++ b/src/corelib/codecs/qtextcodec.cpp
@@ -38,11 +38,10 @@
 ****************************************************************************/
 
 #include "qplatformdefs.h"
+
 #include "qtextcodec.h"
 #include "qtextcodec_p.h"
 
-#ifndef QT_NO_TEXTCODEC
-
 #include "qbytearraymatcher.h"
 #include "qlist.h"
 #include "qfile.h"
@@ -1221,5 +1220,3 @@ bool QTextDecoder::hasFailure() const
 }
 
 QT_END_NAMESPACE
-
-#endif // QT_NO_TEXTCODEC
diff --git a/src/corelib/codecs/qtextcodec.h b/src/corelib/codecs/qtextcodec.h
index 8153bebac8..c0261b7aa2 100644
--- a/src/corelib/codecs/qtextcodec.h
+++ b/src/corelib/codecs/qtextcodec.h
@@ -43,10 +43,9 @@
 #include <QtCore/qstring.h>
 #include <QtCore/qlist.h>
 
-QT_BEGIN_NAMESPACE
-
+QT_REQUIRE_CONFIG(textcodec);
 
-#ifndef QT_NO_TEXTCODEC
+QT_BEGIN_NAMESPACE
 
 class QTextCodec;
 class QIODevice;
@@ -167,8 +166,6 @@ private:
     QTextCodec::ConverterState state;
 };
 
-#endif // QT_NO_TEXTCODEC
-
 QT_END_NAMESPACE
 
 #endif // QTEXTCODEC_H
diff --git a/src/corelib/codecs/qtextcodec_p.h b/src/corelib/codecs/qtextcodec_p.h
index f3c2d090c9..6e19d1d30e 100644
--- a/src/corelib/codecs/qtextcodec_p.h
+++ b/src/corelib/codecs/qtextcodec_p.h
@@ -52,12 +52,13 @@
 //
 
 #include <QtCore/private/qglobal_p.h>
-#include "qtextcodec.h"
 #include <string.h>
 
 QT_BEGIN_NAMESPACE
 
-#ifndef QT_NO_TEXTCODEC
+#if QT_CONFIG(textcodec)
+
+#include "qtextcodec.h"
 
 #if defined(Q_OS_MAC) || defined(Q_OS_ANDROID) || defined(Q_OS_QNX)
 #define QT_LOCALE_IS_UTF8
@@ -82,7 +83,7 @@ struct QTextCodecUnalignedPointer
 
 bool qTextCodecNameMatch(const char *a, const char *b);
 
-#else
+#else // without textcodec:
 
 class QTextCodec
 {
@@ -109,7 +110,7 @@ public:
     };
 };
 
-#endif //QT_NO_TEXTCODEC
+#endif // textcodec
 
 QT_END_NAMESPACE
 
diff --git a/src/corelib/codecs/qutfcodec.cpp b/src/corelib/codecs/qutfcodec.cpp
index ce1b092a54..0dffdd723e 100644
--- a/src/corelib/codecs/qutfcodec.cpp
+++ b/src/corelib/codecs/qutfcodec.cpp
@@ -922,7 +922,7 @@ QString QUtf32::convertToUnicode(const char *chars, int len, QTextCodec::Convert
 }
 
 
-#ifndef QT_NO_TEXTCODEC
+#if QT_CONFIG(textcodec)
 
 QUtf8Codec::~QUtf8Codec()
 {
@@ -1076,6 +1076,6 @@ QList<QByteArray> QUtf32LECodec::aliases() const
     return list;
 }
 
-#endif //QT_NO_TEXTCODEC
+#endif // textcodec
 
 QT_END_NAMESPACE
diff --git a/src/corelib/codecs/qutfcodec_p.h b/src/corelib/codecs/qutfcodec_p.h
index 659a229dae..d7743753af 100644
--- a/src/corelib/codecs/qutfcodec_p.h
+++ b/src/corelib/codecs/qutfcodec_p.h
@@ -52,7 +52,13 @@
 // We mean it.
 //
 
+#include <QtCore/qstring.h>
+#include <QtCore/qlist.h>
+
+#if QT_CONFIG(textcodec)
 #include "QtCore/qtextcodec.h"
+#endif
+
 #include "private/qtextcodec_p.h"
 
 QT_BEGIN_NAMESPACE
@@ -311,7 +317,7 @@ struct QUtf32
     static QByteArray convertFromUnicode(const QChar *, int, QTextCodec::ConverterState *, DataEndianness = DetectEndianness);
 };
 
-#ifndef QT_NO_TEXTCODEC
+#if QT_CONFIG(textcodec)
 
 class QUtf8Codec : public QTextCodec {
 public:
@@ -391,7 +397,7 @@ public:
 };
 
 
-#endif // QT_NO_TEXTCODEC
+#endif // textcodec
 
 QT_END_NAMESPACE
 
diff --git a/src/corelib/codecs/qwindowscodec_p.h b/src/corelib/codecs/qwindowscodec_p.h
index 2fd3c35378..1ca6d5567e 100644
--- a/src/corelib/codecs/qwindowscodec_p.h
+++ b/src/corelib/codecs/qwindowscodec_p.h
@@ -53,6 +53,8 @@
 #include <QtCore/private/qglobal_p.h>
 #include "qtextcodec.h"
 
+QT_REQUIRE_CONFIG(textcodec);
+
 QT_BEGIN_NAMESPACE
 
 class QWindowsLocalCodec: public QTextCodec