diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-21 19:27:22 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-21 19:27:22 (GMT) |
| commit | 2ca4e77f0a29bc6d7571ca614a6101d9e1bd83e0 (patch) | |
| tree | 0cee14719cb93e8a3929a6f3e4c6f7e7d4a6e184 /tests/auto/qfiledialog | |
| parent | 8e53d9f5992277fe1729d3310458c6391f204eb9 (diff) | |
| parent | 2fd2858f2e12ea50c02d48d8af29e5540f8095a2 (diff) | |
| download | Qt-2ca4e77f0a29bc6d7571ca614a6101d9e1bd83e0.zip Qt-2ca4e77f0a29bc6d7571ca614a6101d9e1bd83e0.tar.gz Qt-2ca4e77f0a29bc6d7571ca614a6101d9e1bd83e0.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Add (correct) .pro files to INSTALLs.
Assign UID3, install example files, remove redundant code.
Make tst_qdialog::throwInExec work with symbian exception policy
Use a compile time constant for the C epoch as a julian day.
Fix test failures for qdatetime on symbian and wince
Fix compile error in QFileDialog autotest
Fix to collections autotest
Fixed vendor info in fluidlauncher sis package.
Fix default_deployment.pkg_prerules
Fix crash on startup on Symbian OS
Diffstat (limited to 'tests/auto/qfiledialog')
| -rw-r--r-- | tests/auto/qfiledialog/tst_qfiledialog.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qfiledialog/tst_qfiledialog.cpp b/tests/auto/qfiledialog/tst_qfiledialog.cpp index 9adb4fc..38a1ee7 100644 --- a/tests/auto/qfiledialog/tst_qfiledialog.cpp +++ b/tests/auto/qfiledialog/tst_qfiledialog.cpp @@ -548,7 +548,7 @@ 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") + 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(...) { |