diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-20 08:31:19 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-20 08:31:19 (GMT) |
| commit | 01fec63b7b8f8cae94f92fca1d806fe8c6156299 (patch) | |
| tree | cd07670f7521cce4743497c4b21ce56cc8fbbfec /src/corelib | |
| parent | 095c92f03e0c01b878eaa0cd1b7844171ce9241f (diff) | |
| parent | 3e5d4bcbcd6a4bdf0bfd6ae5933a61293720656a (diff) | |
| download | Qt-01fec63b7b8f8cae94f92fca1d806fe8c6156299.zip Qt-01fec63b7b8f8cae94f92fca1d806fe8c6156299.tar.gz Qt-01fec63b7b8f8cae94f92fca1d806fe8c6156299.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt 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) |