diff options
Diffstat (limited to 'tests/auto/qdiriterator')
| -rw-r--r-- | tests/auto/qdiriterator/qdiriterator.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qdiriterator/tst_qdiriterator.cpp | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/tests/auto/qdiriterator/qdiriterator.pro b/tests/auto/qdiriterator/qdiriterator.pro index 2db6617585..ece886cbcb 100644 --- a/tests/auto/qdiriterator/qdiriterator.pro +++ b/tests/auto/qdiriterator/qdiriterator.pro @@ -3,7 +3,7 @@ SOURCES += tst_qdiriterator.cpp RESOURCES += qdiriterator.qrc QT = core -wince*: { +wince*|symbian*: { addFiles.sources = entrylist recursiveDirs foo addFiles.path = . DEPLOYMENT += addFiles diff --git a/tests/auto/qdiriterator/tst_qdiriterator.cpp b/tests/auto/qdiriterator/tst_qdiriterator.cpp index 79e44d18a9..5708b50a49 100644 --- a/tests/auto/qdiriterator/tst_qdiriterator.cpp +++ b/tests/auto/qdiriterator/tst_qdiriterator.cpp @@ -92,7 +92,7 @@ tst_QDirIterator::tst_QDirIterator() QFile::remove("entrylist/directory/entrylist4.lnk"); #ifndef Q_NO_SYMLINKS -#ifdef Q_OS_WIN +#ifdef Q_OS_WIN || defined(Q_OS_SYMBIAN) // ### Sadly, this is a platform difference right now. QFile::link("entrylist/file", "entrylist/linktofile.lnk"); QFile::link("entrylist/directory", "entrylist/linktodirectory.lnk"); @@ -200,6 +200,11 @@ void tst_QDirIterator::iterateRelativeDirectory() QFETCH(QStringList, nameFilters); QFETCH(QStringList, entries); +#if defined(Q_OS_SYMBIAN) + QEXPECT_FAIL("no flags", "Symlink to directories is currently unsupported by Open C", Continue); + QEXPECT_FAIL("QDir::Subdirectories | QDir::FollowSymlinks", "Symlink to directories is currently unsupported by Open C", Continue); +#endif // defined(Q_OS_SYMBIAN) + QDirIterator it(dirName, nameFilters, filters, flags); QStringList list; while (it.hasNext()) { |