diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-29 06:06:10 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-29 06:06:10 (GMT) |
| commit | 91f47c01fa2e17f93af34597b135f30cb157dada (patch) | |
| tree | 1600eed7b732164b49a73dd966b63ac8ab9d2e52 | |
| parent | 473da75ed84651c70ae0d10e23f09e1a0e4ae799 (diff) | |
| parent | 51a444a789ff5f3ba72d3f817f4cdf427d2ff91d (diff) | |
| download | Qt-91f47c01fa2e17f93af34597b135f30cb157dada.zip Qt-91f47c01fa2e17f93af34597b135f30cb157dada.tar.gz Qt-91f47c01fa2e17f93af34597b135f30cb157dada.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Use QSKIP rather than commenting a failure.
| -rw-r--r-- | tests/auto/qfiledialog/tst_qfiledialog.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/qfiledialog/tst_qfiledialog.cpp b/tests/auto/qfiledialog/tst_qfiledialog.cpp index f246750..9adb4fc 100644 --- a/tests/auto/qfiledialog/tst_qfiledialog.cpp +++ b/tests/auto/qfiledialog/tst_qfiledialog.cpp @@ -547,6 +547,9 @@ void tst_QFiledialog::completer() // ### 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") +#endif QTRY_COMPARE(cModel->rowCount(), expected); } QT_CATCH(...) { qDeleteAll(files); |