diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-11-09 13:27:11 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-11-09 13:27:12 +0100 |
| commit | c69f43594fc921fea82377e7b31a7f55f718051d (patch) | |
| tree | 37d30b254f0c24f9588dcb3e8f1b47becdba8ef1 /src/corelib/codecs/qicucodec.cpp | |
| parent | 9137691e745039f8ad9cdee2594a958e244ba341 (diff) | |
| parent | dec7961709c90f6977d2447f7fa6c6625af41cb2 (diff) | |
Merge 5.11 into 5.11.3
Change-Id: I9a84ca8038a65daab50b6205bc7e1e3b5b5098aa
Diffstat (limited to 'src/corelib/codecs/qicucodec.cpp')
| -rw-r--r-- | src/corelib/codecs/qicucodec.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/corelib/codecs/qicucodec.cpp b/src/corelib/codecs/qicucodec.cpp index 06a6d95e82..101c3a3278 100644 --- a/src/corelib/codecs/qicucodec.cpp +++ b/src/corelib/codecs/qicucodec.cpp @@ -39,8 +39,6 @@ #include "qicucodec_p.h" -#ifndef QT_NO_TEXTCODEC - #include "qtextcodec_p.h" #include "qutfcodec_p.h" #include "qlatincodec_p.h" @@ -698,5 +696,3 @@ int QIcuCodec::mibEnum() const } QT_END_NAMESPACE - -#endif // QT_NO_TEXTCODEC |