diff options
| author | Martin Smith <msmith@trolltech.com> | 2009-11-20 12:27:49 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2009-11-20 12:27:49 (GMT) |
| commit | bda75bfc7cf0137474005a0a733ff83e2aae16e9 (patch) | |
| tree | 13803dded750939f651951186c557cb051bd343f /src/corelib | |
| parent | 8b45a7a160daa0d6b38ae1f6cbfd8162c580574b (diff) | |
| parent | a222302ca45e33306dacae0aa16a572c13abc483 (diff) | |
| download | Qt-bda75bfc7cf0137474005a0a733ff83e2aae16e9.zip Qt-bda75bfc7cf0137474005a0a733ff83e2aae16e9.tar.gz Qt-bda75bfc7cf0137474005a0a733ff83e2aae16e9.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/codecs/qtextcodec.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp index 680fcd7..5d62095 100644 --- a/src/corelib/codecs/qtextcodec.cpp +++ b/src/corelib/codecs/qtextcodec.cpp @@ -1573,9 +1573,6 @@ QTextCodec *QTextCodec::codecForHtml(const QByteArray &ba) cannot be detected from the content provided, \a defaultCodec is returned. - The behavior of this function is undefined if \a ba is not - encoded in unicode. - \sa codecForHtml() */ QTextCodec *QTextCodec::codecForUtfText(const QByteArray &ba, QTextCodec *defaultCodec) @@ -1620,9 +1617,6 @@ QTextCodec *QTextCodec::codecForUtfText(const QByteArray &ba, QTextCodec *defaul that is capable of decoding the text to unicode. If the codec cannot be detected, this overload returns a Latin-1 QTextCodec. - The behavior of this function is undefined if \a ba is not - encoded in unicode. - \sa codecForHtml() */ QTextCodec *QTextCodec::codecForUtfText(const QByteArray &ba) |