diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-11-09 10:34:33 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-11-09 10:34:33 +0100 |
| commit | bc07958f922519bca1acc5930498ee0273576699 (patch) | |
| tree | d5fda8e4458c2543458dbaeb7f4830c6d4750954 /src/corelib/codecs/qtextcodec_p.h | |
| parent | b01a53fe328b37324c6e3ab38c50f156c93c6afe (diff) | |
| parent | dec7961709c90f6977d2447f7fa6c6625af41cb2 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
.qmake.conf
qmake/Makefile.unix
src/gui/text/qtextdocument.cpp
src/gui/text/qtextdocument.h
Change-Id: Iba26da0ecbf2aa4ff4b956391cfb373f977f88c9
Diffstat (limited to 'src/corelib/codecs/qtextcodec_p.h')
| -rw-r--r-- | src/corelib/codecs/qtextcodec_p.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/corelib/codecs/qtextcodec_p.h b/src/corelib/codecs/qtextcodec_p.h index be0cab93e6..0e449d994c 100644 --- a/src/corelib/codecs/qtextcodec_p.h +++ b/src/corelib/codecs/qtextcodec_p.h @@ -52,12 +52,13 @@ // #include <QtCore/private/qglobal_p.h> -#include "qtextcodec.h" #include <string.h> QT_BEGIN_NAMESPACE -#ifndef QT_NO_TEXTCODEC +#if QT_CONFIG(textcodec) + +#include "qtextcodec.h" #if defined(Q_OS_MAC) || defined(Q_OS_ANDROID) || defined(Q_OS_QNX) || defined(Q_OS_WASM) #define QT_LOCALE_IS_UTF8 @@ -82,7 +83,7 @@ struct QTextCodecUnalignedPointer bool qTextCodecNameMatch(const char *a, const char *b); -#else +#else // without textcodec: class QTextCodec { @@ -109,7 +110,7 @@ public: }; }; -#endif //QT_NO_TEXTCODEC +#endif // textcodec QT_END_NAMESPACE |