diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-12-16 13:06:25 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-12-16 14:06:10 (GMT) |
| commit | 851344b93b797a9c6fb13f8c6d4ede0594040633 (patch) | |
| tree | b093b3113c56508936d175f90daa549da0b9d519 /tests | |
| parent | 06034e9ab2560e777f457fedc8a8cf4380461fed (diff) | |
| download | Qt-851344b93b797a9c6fb13f8c6d4ede0594040633.zip Qt-851344b93b797a9c6fb13f8c6d4ede0594040633.tar.gz Qt-851344b93b797a9c6fb13f8c6d4ede0594040633.tar.bz2 | |
Fixed qdiriterator benchmark for Symbian
Deployment was handled similarly to WinCE.
Some whitespace was also removed.
Task-number: QTBUG-6690
Reviewed-by: Janne Anttila
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/benchmarks/qdiriterator/main.cpp | 10 | ||||
| -rwxr-xr-x | tests/benchmarks/qdiriterator/qdiriterator.pro | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/benchmarks/qdiriterator/main.cpp b/tests/benchmarks/qdiriterator/main.cpp index 2a400e3..9e4e53e 100644 --- a/tests/benchmarks/qdiriterator/main.cpp +++ b/tests/benchmarks/qdiriterator/main.cpp @@ -73,7 +73,7 @@ private slots: void tst_qdiriterator::data() { -#ifdef Q_OS_WINCE +#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN) QByteArray qtdir = qPrintable(QCoreApplication::applicationDirPath()); qtdir += "/depot"; #else @@ -148,9 +148,9 @@ static int posix_helper(const char *dirpath) int count = 0; while ((entry = ::readdir(dir))) { - if (qstrcmp(entry->d_name, ".") == 0) + if (qstrcmp(entry->d_name, ".") == 0) continue; - if (qstrcmp(entry->d_name, "..") == 0) + if (qstrcmp(entry->d_name, "..") == 0) continue; ++count; QByteArray ba = dirpath; @@ -198,7 +198,7 @@ void tst_qdiriterator::diriterator() //QDir::AllEntries | QDir::Hidden, QDir::Files, QDirIterator::Subdirectories); - + while (dir.hasNext()) { dir.next(); //printf("%s\n", qPrintable(dir.fileName())); @@ -231,7 +231,7 @@ void tst_qdiriterator::fsiterator() //QDir::Files | QDir::NoDotAndDotDot, QDir::Files, QFileSystemIterator::Subdirectories); - + for (; !dir.atEnd(); dir.next()) { dump && printf("%d %s\n", dir.fileInfo().isDir(), diff --git a/tests/benchmarks/qdiriterator/qdiriterator.pro b/tests/benchmarks/qdiriterator/qdiriterator.pro index fb4b753..e06d746 100755 --- a/tests/benchmarks/qdiriterator/qdiriterator.pro +++ b/tests/benchmarks/qdiriterator/qdiriterator.pro @@ -15,7 +15,7 @@ SOURCES += main.cpp SOURCES += qfilesystemiterator.cpp HEADERS += qfilesystemiterator.h -wince*: { +wince*|symbian: { corelibdir.sources = $$QT_SOURCE_TREE/src/corelib corelibdir.path = ./depot/src DEPLOYMENT += corelibdir |