From 825f98815683faea06144ab0262129b0367798ee Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@qt.io>
Date: Tue, 2 Oct 2018 12:59:24 +0200
Subject: 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>
---
 src/corelib/codecs/qsimplecodec.cpp | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/corelib/codecs/qsimplecodec.cpp')

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
-- 
cgit v1.2.3