From 9c8ca26a4829d5ce810c9653fec3dfe48717f0b1 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@qt.io>
Date: Fri, 28 Sep 2018 10:33:48 +0200
Subject: Modernize the "codecs" feature

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

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

diff --git a/src/corelib/codecs/qtsciicodec_p.h b/src/corelib/codecs/qtsciicodec_p.h
index 78f9350a19..9247098e36 100644
--- a/src/corelib/codecs/qtsciicodec_p.h
+++ b/src/corelib/codecs/qtsciicodec_p.h
@@ -83,9 +83,9 @@
 #include <QtCore/private/qglobal_p.h>
 #include "QtCore/qtextcodec.h"
 
-QT_BEGIN_NAMESPACE
+QT_REQUIRE_CONFIG(codecs);
 
-#ifndef QT_NO_CODECS
+QT_BEGIN_NAMESPACE
 
 class QTsciiCodec : public QTextCodec {
 public:
@@ -98,8 +98,6 @@ public:
     QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const override;
 };
 
-#endif // QT_NO_CODECS
-
 QT_END_NAMESPACE
 
 #endif // QTSCIICODEC_P_H
-- 
cgit v1.2.3