diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 16:16:29 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 16:23:19 +0200 |
| commit | f4b4c4f79b629498f3cddbbc10df8c1b4d6020d9 (patch) | |
| tree | 4119707660438ff58bd51f9cbe0f9e2a33f4b806 /src/corelib/codecs/qicucodec.cpp | |
| parent | 9bd6cec74dbbc5aece55dc0c8808494db29b9963 (diff) | |
| parent | 93f2f33a49f6c96a4f94f344edf03164ed944d02 (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake
Change-Id: I3a1d7673c3c20019ab12a2ea0a60f1619920a34c
Diffstat (limited to 'src/corelib/codecs/qicucodec.cpp')
| -rw-r--r-- | src/corelib/codecs/qicucodec.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/codecs/qicucodec.cpp b/src/corelib/codecs/qicucodec.cpp index 101c3a3278..b9f1a814fa 100644 --- a/src/corelib/codecs/qicucodec.cpp +++ b/src/corelib/codecs/qicucodec.cpp @@ -42,8 +42,10 @@ #include "qtextcodec_p.h" #include "qutfcodec_p.h" #include "qlatincodec_p.h" +#if QT_CONFIG(codecs) #include "qtsciicodec_p.h" #include "qisciicodec_p.h" +#endif #include "qsimplecodec_p.h" #include "private/qcoreglobaldata_p.h" #include "qdebug.h" |