summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2012-06-24 23:31:45 +0200
committerQt by Nokia <qt-info@nokia.com>2012-06-25 00:19:31 +0200
commit587b80f67dee42bd6231a2cd836dded05e5dfd13 (patch)
treee4e59344decb4383ed708be5b2aff576cab04444 /src
parentb2412843cb53e664248ee15b23c84333895414e3 (diff)
The codecForTr() should be utf8
tr() assumes utf8 as input encoding, not latin1. Change-Id: If834f8c169bdb431d78713d14b03542d3a7ca8e4 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/codecs/qtextcodec.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/codecs/qtextcodec.h b/src/corelib/codecs/qtextcodec.h
index 690214323d..65cf61c44a 100644
--- a/src/corelib/codecs/qtextcodec.h
+++ b/src/corelib/codecs/qtextcodec.h
@@ -73,7 +73,7 @@ public:
static void setCodecForLocale(QTextCodec *c);
#if QT_DEPRECATED_SINCE(5, 0)
- QT_DEPRECATED static QTextCodec *codecForTr() { return codecForMib(4); /* Latin1 */ }
+ QT_DEPRECATED static QTextCodec *codecForTr() { return codecForMib(106); /* Utf8 */ }
#endif
static QTextCodec *codecForHtml(const QByteArray &ba);