diff options
Diffstat (limited to 'src/corelib/codecs/qtextcodec.cpp')
| -rw-r--r-- | src/corelib/codecs/qtextcodec.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp index 466c575c3e..804e0b2935 100644 --- a/src/corelib/codecs/qtextcodec.cpp +++ b/src/corelib/codecs/qtextcodec.cpp @@ -505,9 +505,9 @@ QTextCodec::~QTextCodec() globalData->allCodecs.removeOne(this); - auto it = globalData->codecCache.cbegin(); + auto it = globalData->codecCache.begin(); - while (it != globalData->codecCache.cend()) { + while (it != globalData->codecCache.end()) { if (it.value() == this) it = globalData->codecCache.erase(it); else @@ -695,11 +695,9 @@ void QTextCodec::setCodecForLocale(QTextCodec *c) \threadsafe Returns a pointer to the codec most suitable for this locale. - On Windows, the codec will be based on a system locale. On Unix - systems, the codec will might fall back to using the \e iconv - library if no builtin codec for the locale can be found. - - Note that in these cases the codec's name will be "System". + The codec will be retrieved from ICU where that backend is in use, otherwise + it may be obtained from an OS-specific API. In the latter case, the codec's + name may be "System". */ QTextCodec* QTextCodec::codecForLocale() |