diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-09-30 13:01:05 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-09-30 13:01:05 (GMT) |
| commit | c3ef2d3a6d9a6e35b05cbd8f370630d5dd85415e (patch) | |
| tree | b11aaa1acca5ffe30cbfe2ce42a00d3597fa6c45 /tests/auto/qdom/tst_qdom.cpp | |
| parent | af1e344ac6046640ddb728f6017b3181469c241d (diff) | |
| parent | 1a902e6dba504b4a25a218555bb326772b5b77a6 (diff) | |
| download | Qt-c3ef2d3a6d9a6e35b05cbd8f370630d5dd85415e.zip Qt-c3ef2d3a6d9a6e35b05cbd8f370630d5dd85415e.tar.gz Qt-c3ef2d3a6d9a6e35b05cbd8f370630d5dd85415e.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Diffstat (limited to 'tests/auto/qdom/tst_qdom.cpp')
| -rw-r--r-- | tests/auto/qdom/tst_qdom.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/qdom/tst_qdom.cpp b/tests/auto/qdom/tst_qdom.cpp index 6637202..6987186 100644 --- a/tests/auto/qdom/tst_qdom.cpp +++ b/tests/auto/qdom/tst_qdom.cpp @@ -1908,7 +1908,8 @@ void tst_QDom::taskQTBUG4595_dontAssertWhenDocumentSpecifiesUnknownEncoding() co QDomDocument d; QVERIFY(d.setContent(xmlWithUnknownEncoding)); - QString dontAssert = d.toString(); // this should not assert + //QString dontAssert = d.toString(); // this should not assert + QVERIFY2(false, "Line above crashes but we still want to run all tests."); QVERIFY(true); } |