summaryrefslogtreecommitdiffstats
path: root/src/corelib/codecs/qutfcodec_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/codecs/qutfcodec_p.h')
-rw-r--r--src/corelib/codecs/qutfcodec_p.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/corelib/codecs/qutfcodec_p.h b/src/corelib/codecs/qutfcodec_p.h
index 7405996fba..b24283ac5e 100644
--- a/src/corelib/codecs/qutfcodec_p.h
+++ b/src/corelib/codecs/qutfcodec_p.h
@@ -52,7 +52,13 @@
// We mean it.
//
+#include <QtCore/qstring.h>
+#include <QtCore/qlist.h>
+
+#if QT_CONFIG(textcodec)
#include "QtCore/qtextcodec.h"
+#endif
+
#include "private/qtextcodec_p.h"
QT_BEGIN_NAMESPACE
@@ -311,7 +317,7 @@ struct QUtf32
static QByteArray convertFromUnicode(const QChar *, int, QTextCodec::ConverterState *, DataEndianness = DetectEndianness);
};
-#ifndef QT_NO_TEXTCODEC
+#if QT_CONFIG(textcodec)
class QUtf8Codec : public QTextCodec {
public:
@@ -391,7 +397,7 @@ public:
};
-#endif // QT_NO_TEXTCODEC
+#endif // textcodec
QT_END_NAMESPACE