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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/corelib/codecs/qtextcodec.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp index e5c33d9d592..466c575c3e4 100644 --- a/src/corelib/codecs/qtextcodec.cpp +++ b/src/corelib/codecs/qtextcodec.cpp @@ -39,11 +39,10 @@ ****************************************************************************/ #include "qplatformdefs.h" + #include "qtextcodec.h" #include "qtextcodec_p.h" -#ifndef QT_NO_TEXTCODEC - #include "qbytearraymatcher.h" #include "qendian.h" #include "qfile.h" @@ -1274,5 +1273,3 @@ bool QTextDecoder::needsMoreData() const } QT_END_NAMESPACE - -#endif // QT_NO_TEXTCODEC |