diff options
| author | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-09-22 08:53:39 (GMT) |
|---|---|---|
| committer | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-09-22 08:53:39 (GMT) |
| commit | def49cd0e2d256ff3c31aa80343ce52f4fd6e2e7 (patch) | |
| tree | 09e3aa8d6e3f72f815b1beaf6d59261b5f45acdd /tests/auto/qtextcodec | |
| parent | e689e41ad1baad65d90866eefe88a96f5e16fa04 (diff) | |
| parent | d14fd301314bcceaf2594a5a18f6d20894c1d353 (diff) | |
| download | Qt-def49cd0e2d256ff3c31aa80343ce52f4fd6e2e7.zip Qt-def49cd0e2d256ff3c31aa80343ce52f4fd6e2e7.tar.gz Qt-def49cd0e2d256ff3c31aa80343ce52f4fd6e2e7.tar.bz2 | |
Merge commit 'origin/4.5' into 4.6
Conflicts:
src/corelib/kernel/qcoreapplication.cpp
tests/auto/windowsmobile/test/tst_windowsmobile.cpp
Diffstat (limited to 'tests/auto/qtextcodec')
| -rw-r--r-- | tests/auto/qtextcodec/tst_qtextcodec.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tests/auto/qtextcodec/tst_qtextcodec.cpp b/tests/auto/qtextcodec/tst_qtextcodec.cpp index 36f910a..3dafbee 100644 --- a/tests/auto/qtextcodec/tst_qtextcodec.cpp +++ b/tests/auto/qtextcodec/tst_qtextcodec.cpp @@ -1816,10 +1816,17 @@ void tst_QTextCodec::codecForHtml() QCOMPARE(QTextCodec::codecForHtml(html)->mibEnum(), 4); // latin 1 - QCOMPARE(QTextCodec::codecForHtml(html, QTextCodec::codecForMib(106))->mibEnum(), 106); // utf-8 + QCOMPARE(QTextCodec::codecForHtml(html, QTextCodec::codecForMib(106))->mibEnum(), 106); // UTF-8 html = "<html><head><meta http-equiv=\"content-type\" content=\"text/html; charset=ISO-8859-15\" /></head></html>"; QCOMPARE(QTextCodec::codecForHtml(html, QTextCodec::codecForMib(106))->mibEnum(), 111); // latin 15 + + html = "<html><head><meta content=\"text/html; charset=ISO-8859-15\" http-equiv=\"content-type\" /></head></html>"; + QCOMPARE(QTextCodec::codecForHtml(html, QTextCodec::codecForMib(106))->mibEnum(), 111); // latin 15 + + html = "<html><head><meta http-equiv=\"content-type\" content=\"text/html; charset=invalid-foo\" /></head></html>"; + QCOMPARE(QTextCodec::codecForHtml(html, QTextCodec::codecForMib(106))->mibEnum(), 106); // UTF-8 + QCOMPARE(QTextCodec::codecForHtml(html)->mibEnum(), 4); // latin 1 } void tst_QTextCodec::codecForUtfText_data() |