diff -r b72c6db6890b -r 5dc02b23752f tests/auto/qfiledialog/tst_qfiledialog.cpp --- a/tests/auto/qfiledialog/tst_qfiledialog.cpp Wed Jun 23 19:07:03 2010 +0300 +++ b/tests/auto/qfiledialog/tst_qfiledialog.cpp Tue Jul 06 15:10:48 2010 +0300 @@ -529,10 +529,6 @@ #endif ++expected; } -#if !defined(Q_OS_WIN) - if (inputStartsWithRootPath) - expected++; -#endif } QTest::qWait(1000); @@ -548,7 +544,7 @@ // ### FIXME: This will fail on Symbian on some tests and some environments until the file engine and QFileSystemModel // are fixed to properly capitalize paths, so that some folders are not duplicated in QFileSystemModel. #if defined(Q_OS_SYMBIAN) - QSKIP("This will fail on Symbian on some tests and some environments until the file engine and QFileSystemModel are fixed to properly capitalize paths") + QSKIP("This will fail on Symbian on some tests and some environments until the file engine and QFileSystemModel are fixed to properly capitalize paths", SkipAll); #endif QTRY_COMPARE(cModel->rowCount(), expected); } QT_CATCH(...) {