diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-10-17 10:35:28 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-10-17 10:35:28 +0200 |
| commit | ccf26f6a88e116abdf8e53acdc02dbd98a4a8dc4 (patch) | |
| tree | 40aaca99471edc709d38e6f82153576bad86747f /src/corelib/codecs/qsjiscodec.cpp | |
| parent | 8ff1ae89bfa32c586e3b44b71dfc49d294a3e043 (diff) | |
| parent | 3eebadc1734463afa469dcd08eab8c5d2557dec6 (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/qsjiscodec.cpp')
| -rw-r--r-- | src/corelib/codecs/qsjiscodec.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/corelib/codecs/qsjiscodec.cpp b/src/corelib/codecs/qsjiscodec.cpp index ba342c9c53a..4f5f9069cd9 100644 --- a/src/corelib/codecs/qsjiscodec.cpp +++ b/src/corelib/codecs/qsjiscodec.cpp @@ -52,7 +52,6 @@ QT_BEGIN_NAMESPACE -#ifndef QT_NO_BIG_CODECS enum { Esc = 0x1b }; @@ -223,6 +222,5 @@ QList<QByteArray> QSjisCodec::_aliases() << "MS_Kanji"; return list; } -#endif // QT_NO_BIG_CODECS QT_END_NAMESPACE |