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/qicucodec.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/qicucodec.cpp')
| -rw-r--r-- | src/corelib/codecs/qicucodec.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/codecs/qicucodec.cpp b/src/corelib/codecs/qicucodec.cpp index ee9f1d0048a..06a6d95e82b 100644 --- a/src/corelib/codecs/qicucodec.cpp +++ b/src/corelib/codecs/qicucodec.cpp @@ -373,7 +373,7 @@ static QTextCodec *loadQtCodec(const char *name) return new QUtf32LECodec; if (!strcmp(name, "ISO-8859-16") || !strcmp(name, "latin10") || !strcmp(name, "iso-ir-226")) return new QSimpleTextCodec(13 /* == 8859-16*/); -#ifndef QT_NO_CODECS +#if QT_CONFIG(codecs) if (!strcmp(name, "TSCII")) return new QTsciiCodec; if (!qstrnicmp(name, "iscii", 5)) |