summaryrefslogtreecommitdiffstats
path: root/tests/auto/qdiriterator
diff options
context:
space:
mode:
authorShane Kearns <shane.kearns@accenture.com>2010-09-09 10:28:11 (GMT)
committerShane Kearns <shane.kearns@accenture.com>2010-09-09 16:10:09 (GMT)
commit5baa2d0da807ec5b4635c891ec27125769bade2d (patch)
tree997f4301bcd4436697a5c7dfe6f9d781df6eab47 /tests/auto/qdiriterator
parent99cc67240494e06297df3876163b40f79b861c36 (diff)
downloadQt-5baa2d0da807ec5b4635c891ec27125769bade2d.zip
Qt-5baa2d0da807ec5b4635c891ec27125769bade2d.tar.gz
Qt-5baa2d0da807ec5b4635c891ec27125769bade2d.tar.bz2
Fix tst_qdiriterator for symbian
Since 21e0423a, the directory structure for iteration is created by the test on initialisation. Furthermore the directory structure no longer exists in git, causing a build error at the deployment stage. Also, defined Q_NO_SYMLINKS to disable test cases related to symlinks Reviewed-By: joao
Diffstat (limited to 'tests/auto/qdiriterator')
-rw-r--r--tests/auto/qdiriterator/qdiriterator.pro5
-rw-r--r--tests/auto/qdiriterator/tst_qdiriterator.cpp2
2 files changed, 1 insertions, 6 deletions
diff --git a/tests/auto/qdiriterator/qdiriterator.pro b/tests/auto/qdiriterator/qdiriterator.pro
index d60b52d..0a154d6 100644
--- a/tests/auto/qdiriterator/qdiriterator.pro
+++ b/tests/auto/qdiriterator/qdiriterator.pro
@@ -3,10 +3,5 @@ SOURCES += tst_qdiriterator.cpp
RESOURCES += qdiriterator.qrc
QT = core
-wince*|symbian: {
- addFiles.sources = entrylist recursiveDirs foo
- addFiles.path = .
- DEPLOYMENT += addFiles
wince*mips*|wincewm50smart-msvc200*: DEFINES += WINCE_BROKEN_ITERATE=1
-}
diff --git a/tests/auto/qdiriterator/tst_qdiriterator.cpp b/tests/auto/qdiriterator/tst_qdiriterator.cpp
index 1a873b8..f78ce34 100644
--- a/tests/auto/qdiriterator/tst_qdiriterator.cpp
+++ b/tests/auto/qdiriterator/tst_qdiriterator.cpp
@@ -53,7 +53,7 @@
#endif
#if defined(Q_OS_SYMBIAN)
-// Open C in Symbian doesn't support symbolic links to directories
+#define Q_NO_SYMLINKS
#define Q_NO_SYMLINKS_TO_DIRS
#endif