From 4e7b58629a0a431fbd5c0ba287c3958efd05da13 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@qt.io>
Date: Thu, 13 Sep 2018 12:45:20 +0200
Subject: Modernize the "big_codecs" feature

Change-Id: Ic23f4a1f81a21711cd81aaa2942b493aca5b38b8
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 src/corelib/codecs/qjiscodec_p.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/corelib/codecs/qjiscodec_p.h')

diff --git a/src/corelib/codecs/qjiscodec_p.h b/src/corelib/codecs/qjiscodec_p.h
index 4db8728817..c3eda25bdf 100644
--- a/src/corelib/codecs/qjiscodec_p.h
+++ b/src/corelib/codecs/qjiscodec_p.h
@@ -84,9 +84,9 @@
 #include <QtCore/qtextcodec.h>
 #include <QtCore/qlist.h>
 
-QT_BEGIN_NAMESPACE
+QT_REQUIRE_CONFIG(big_codecs);
 
-#ifndef QT_NO_BIG_CODECS
+QT_BEGIN_NAMESPACE
 
 class QJisCodec : public QTextCodec {
 public:
@@ -108,8 +108,6 @@ protected:
     const QJpUnicodeConv *conv;
 };
 
-#endif // QT_NO_BIG_CODECS
-
 QT_END_NAMESPACE
 
 #endif // QJISCODEC_P_H
-- 
cgit v1.2.3