summaryrefslogtreecommitdiffstats
path: root/src/corelib/codecs/qjiscodec_p.h
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-10-17 10:35:28 +0200
committerLiang Qi <liang.qi@qt.io>2018-10-17 10:35:28 +0200
commitccf26f6a88e116abdf8e53acdc02dbd98a4a8dc4 (patch)
tree40aaca99471edc709d38e6f82153576bad86747f /src/corelib/codecs/qjiscodec_p.h
parent8ff1ae89bfa32c586e3b44b71dfc49d294a3e043 (diff)
parent3eebadc1734463afa469dcd08eab8c5d2557dec6 (diff)
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts: src/plugins/platformthemes/platformthemes.pro src/printsupport/kernel/qplatformprintdevice.cpp Change-Id: Iac01729ad954bb1c7af5867d982eb243b2139ee6
Diffstat (limited to 'src/corelib/codecs/qjiscodec_p.h')
-rw-r--r--src/corelib/codecs/qjiscodec_p.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/corelib/codecs/qjiscodec_p.h b/src/corelib/codecs/qjiscodec_p.h
index 1ffe4a63f6..41195af108 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