diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-16 14:21:08 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-16 14:21:08 (GMT) |
| commit | 6b07987e030deb402f51eda69b640ffd07f372d5 (patch) | |
| tree | 200f06b10bc154a1adf1a5dcd374738d7fd26ea1 /tests/benchmarks/qdiriterator/main.cpp | |
| parent | 4d34dc665a5145237801e46cc0a502e32b1a5dad (diff) | |
| parent | a2ec72ee604181892050093669b870580708842d (diff) | |
| download | Qt-6b07987e030deb402f51eda69b640ffd07f372d5.zip Qt-6b07987e030deb402f51eda69b640ffd07f372d5.tar.gz Qt-6b07987e030deb402f51eda69b640ffd07f372d5.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: (31 commits)
Fixed qstylesheetstyle benchmark for Symbian
Fixed qdiriterator benchmark for Symbian
Fixed events benchmark postEvent function
Fix for QTBUG-4908 SVG transparency rendering problem.
Long informative texts causes messagebox to grow outside of screen area
qreal-ization
qreal-ization
qreal-ization
QS60Style: Remove layouts with mirrored information
Fixed qgraphicsview autotest build for winscw.
Enabled input method update code for all platforms.
(ODBC) Fixes segfault when error string is larger than 256 chars.
Fixed QGraphicsView benchmark for Symbian.
FEP indicator shown in status pane when it should not
Skipped the most memory intensive tests in QByteArray benchmark.
qreal-ization
qreal-ization
QS60Style: Theme graphics for QSlider in 3.1
QS60Style: Groove changes caused build break of S60 3.1
Slow spinbox on N95 when using keys Up/Down
...
Diffstat (limited to 'tests/benchmarks/qdiriterator/main.cpp')
| -rw-r--r-- | tests/benchmarks/qdiriterator/main.cpp | 10 |
1 files changed, 5 insertions, 5 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(), |