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, 1 insertions, 1 deletions

diff --git a/src/tools/uic/main.cpp b/src/tools/uic/main.cpp
index 46a1e66bcc..b1567cc3c5 100644
--- a/src/tools/uic/main.cpp
+++ b/src/tools/uic/main.cpp
@@ -137,7 +137,7 @@ int runUic(int argc, char *argv[])
             return 1;
         }
         out = new QTextStream(&f);
-#ifndef QT_NO_TEXTCODEC
+#if QT_CONFIG(textcodec)
         out->setCodec(QTextCodec::codecForName("UTF-8"));
 #endif
     }