summaryrefslogtreecommitdiffstats
path: root/tests/auto/qdom
diff options
context:
space:
mode:
authorPeter Hartmann <peter.hartmann@nokia.com>2009-10-26 12:10:13 (GMT)
committerPeter Hartmann <peter.hartmann@nokia.com>2009-10-26 12:10:13 (GMT)
commit2b46eff0e7f7d11cf957b9b180177cc4b368c9aa (patch)
tree03e166e8393e1928ec5ed3c79c96fa0accd11460 /tests/auto/qdom
parente1f691d84dad17c5ee47c97c31ae743093ad8bc9 (diff)
parente2ef97128c006ac2a5c99c67bb54eebaa3b45720 (diff)
downloadQt-2b46eff0e7f7d11cf957b9b180177cc4b368c9aa.zip
Qt-2b46eff0e7f7d11cf957b9b180177cc4b368c9aa.tar.gz
Qt-2b46eff0e7f7d11cf957b9b180177cc4b368c9aa.tar.bz2
Merge commit 'origin/4.6' into core-4.6
Diffstat (limited to 'tests/auto/qdom')
-rw-r--r--tests/auto/qdom/tst_qdom.cpp1
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);