diff options
| author | Thomas Zander <zander@kde.org> | 2013-01-23 09:08:27 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-30 12:44:51 (GMT) |
| commit | 5073f6bd3828997b5432f2c9ae57a0b2dae1eeb6 (patch) | |
| tree | a119ad8cd900178ba7138101aaa02f6868260a22 /src | |
| parent | 09d9cfdecea261176f9bc8133cdb498b456f0294 (diff) | |
| download | Qt-5073f6bd3828997b5432f2c9ae57a0b2dae1eeb6.zip Qt-5073f6bd3828997b5432f2c9ae57a0b2dae1eeb6.tar.gz Qt-5073f6bd3828997b5432f2c9ae57a0b2dae1eeb6.tar.bz2 | |
Make compile with QT_NO_FILESYSTEMITERATOR
Change-Id: Ie79dda5a48288a1d9cd4b7e0a7934ee9db48c953
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Thomas Zander <zander@kde.org>
Reviewed-by: João Abecasis <joao@abecasis.name>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/io/qfilesystemiterator_win.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/io/qfsfileengine.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/io/qfsfileengine.h | 2 | ||||
| -rw-r--r-- | src/corelib/io/qfsfileengine_iterator.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/io/qfsfileengine_iterator_p.h | 2 |
5 files changed, 10 insertions, 0 deletions
diff --git a/src/corelib/io/qfilesystemiterator_win.cpp b/src/corelib/io/qfilesystemiterator_win.cpp index 90232f7..dd5a974 100644 --- a/src/corelib/io/qfilesystemiterator_win.cpp +++ b/src/corelib/io/qfilesystemiterator_win.cpp @@ -51,6 +51,7 @@ #include <QtCore/qt_windows.h> QT_BEGIN_NAMESPACE +#ifndef QT_NO_FILESYSTEMITERATOR bool done = true; @@ -147,4 +148,5 @@ bool QFileSystemIterator::advance(QFileSystemEntry &fileEntry, QFileSystemMetaDa return false; } +#endif // QT_NO_FILESYSTEMITERATOR QT_END_NAMESPACE diff --git a/src/corelib/io/qfsfileengine.cpp b/src/corelib/io/qfsfileengine.cpp index ab1a798..c2d70b6 100644 --- a/src/corelib/io/qfsfileengine.cpp +++ b/src/corelib/io/qfsfileengine.cpp @@ -777,6 +777,7 @@ qint64 QFSFileEnginePrivate::writeFdFh(const char *data, qint64 len) return writtenBytes; } +#ifndef QT_NO_FILESYSTEMITERATOR /*! \internal */ @@ -792,6 +793,7 @@ QAbstractFileEngine::Iterator *QFSFileEngine::endEntryList() { return 0; } +#endif /*! \internal diff --git a/src/corelib/io/qfsfileengine.h b/src/corelib/io/qfsfileengine.h index 76db2a9..a413efc 100644 --- a/src/corelib/io/qfsfileengine.h +++ b/src/corelib/io/qfsfileengine.h @@ -92,8 +92,10 @@ public: void setFileName(const QString &file); int handle() const; +#ifndef QT_NO_FILESYSTEMITERATOR Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames); Iterator *endEntryList(); +#endif qint64 read(char *data, qint64 maxlen); qint64 readLine(char *data, qint64 maxlen); diff --git a/src/corelib/io/qfsfileengine_iterator.cpp b/src/corelib/io/qfsfileengine_iterator.cpp index 0627e0c..3662d6d 100644 --- a/src/corelib/io/qfsfileengine_iterator.cpp +++ b/src/corelib/io/qfsfileengine_iterator.cpp @@ -44,6 +44,7 @@ #include "qvariant.h" #ifndef QT_NO_FSFILEENGINE +#ifndef QT_NO_FILESYSTEMITERATOR QT_BEGIN_NAMESPACE @@ -103,4 +104,5 @@ QFileInfo QFSFileEngineIterator::currentFileInfo() const QT_END_NAMESPACE +#endif // QT_NO_FILESYSTEMITERATOR #endif // QT_NO_FSFILEENGINE diff --git a/src/corelib/io/qfsfileengine_iterator_p.h b/src/corelib/io/qfsfileengine_iterator_p.h index 474deeb..5414163 100644 --- a/src/corelib/io/qfsfileengine_iterator_p.h +++ b/src/corelib/io/qfsfileengine_iterator_p.h @@ -58,6 +58,7 @@ #include "qdir.h" #ifndef QT_NO_FSFILEENGINE +#ifndef QT_NO_FILESYSTEMITERATOR QT_BEGIN_NAMESPACE @@ -86,6 +87,7 @@ private: QT_END_NAMESPACE +#endif // QT_NO_FILESYSTEMITERATOR #endif // QT_NO_FSFILEENGINE #endif // QFSFILEENGINE_ITERATOR_P_H |