diff options
author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-10-22 09:18:02 (GMT) |
---|---|---|
committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-10-22 09:18:02 (GMT) |
commit | 4f3c09be1c736d2d39c8266138dc4519f79fff29 (patch) | |
tree | 3d4a0ccba9cabf3e6a5fda58d9ad5dce1b67b30d /tests/auto/qdom/tst_qdom.cpp | |
parent | 19c60da9c15dc609d6d07c687a59d9c2c1a4da13 (diff) | |
parent | d4a136dc3f1176665c19eec24fa43f40e5180a89 (diff) | |
download | Qt-4f3c09be1c736d2d39c8266138dc4519f79fff29.zip Qt-4f3c09be1c736d2d39c8266138dc4519f79fff29.tar.gz Qt-4f3c09be1c736d2d39c8266138dc4519f79fff29.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6-WM_NULL-driven
Diffstat (limited to 'tests/auto/qdom/tst_qdom.cpp')
-rw-r--r-- | tests/auto/qdom/tst_qdom.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/qdom/tst_qdom.cpp b/tests/auto/qdom/tst_qdom.cpp index 6637202..0d58554e 100644 --- a/tests/auto/qdom/tst_qdom.cpp +++ b/tests/auto/qdom/tst_qdom.cpp @@ -322,6 +322,7 @@ void tst_QDom::toString_01_data() */ void tst_QDom::toString_01() { + QFAIL("make test fail instead of timing out, will be fixed later (QT-2357)"); QFETCH(QString, fileName); QFile f(fileName); |