diff options
| author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-06-12 14:07:08 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-06-12 13:52:55 +0000 |
| commit | 5ab74ffca1733c679bc020e80984e864d1b2ef4c (patch) | |
| tree | 9d04ee56763889abc650f98761ba03001e34ed04 /tests/benchmarks | |
| parent | 53b83ac413b3dfde437fefbfdf329f9f7bcda283 (diff) | |
Namespace copy of QFileSystemIterator in QDirIterator benchmark
Otherwise you cannot link it statically against QtCore.
Change-Id: I4ac35602cea2192974f3e96ecad35edac976ce27
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Diffstat (limited to 'tests/benchmarks')
3 files changed, 9 insertions, 2 deletions
diff --git a/tests/benchmarks/corelib/io/qdiriterator/main.cpp b/tests/benchmarks/corelib/io/qdiriterator/main.cpp index 272bafc7dd..42d36a22f8 100644 --- a/tests/benchmarks/corelib/io/qdiriterator/main.cpp +++ b/tests/benchmarks/corelib/io/qdiriterator/main.cpp @@ -223,12 +223,12 @@ void tst_qdiriterator::fsiterator() int c = 0; dump && printf("\n\n\n\n"); - QFileSystemIterator dir(dirpath, + QDirIteratorTest::QFileSystemIterator dir(dirpath, //QDir::AllEntries | QDir::Hidden | QDir::NoDotAndDotDot, //QDir::AllEntries | QDir::Hidden, //QDir::Files | QDir::NoDotAndDotDot, QDir::Files, - QFileSystemIterator::Subdirectories); + QDirIteratorTest::QFileSystemIterator::Subdirectories); for (; !dir.atEnd(); dir.next()) { dump && printf("%d %s\n", diff --git a/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.cpp b/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.cpp index 1b28f462aa..a4db21742d 100644 --- a/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.cpp +++ b/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.cpp @@ -99,6 +99,8 @@ QT_BEGIN_NAMESPACE +namespace QDirIteratorTest { + class QFileSystemIteratorPrivate { public: @@ -671,4 +673,6 @@ QString QFileSystemIterator::path() const return QString::fromLocal8Bit(d->m_dirPaths.top()); } +} // QDirIteratorTest:: + QT_END_NAMESPACE diff --git a/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.h b/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.h index b940c0061b..96fa5177a0 100644 --- a/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.h +++ b/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.h @@ -38,6 +38,7 @@ QT_BEGIN_NAMESPACE +namespace QDirIteratorTest { class QFileSystemIteratorPrivate; class //Q_CORE_EXPORT @@ -81,6 +82,8 @@ private: Q_DECLARE_OPERATORS_FOR_FLAGS(QFileSystemIterator::IteratorFlags) +} // namespace QDirIteratorTest + QT_END_NAMESPACE #endif |