1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build error with QT_NO_FILESYSTEMITERATOR

Browse Source 
Change-Id: If39f1077ab1cb126632ea77d998fc279aabbcd5c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Tasuku Suzuki 2012-11-24 23:45:22 +09:00 committed by The Qt Project
parent 28389db8a1
commit 1c818c34ea
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/io/qfsfileengine.cpp
View File

@ -736,6 +736,7 @@ qint64 QFSFileEnginePrivate::writeFdFh(const char *data, qint64 len)
return writtenBytes; return writtenBytes;
} }
#ifndef QT_NO_FILESYSTEMITERATOR
/*! /*!
\internal \internal
*/ */
@ -751,6 +752,7 @@ QAbstractFileEngine::Iterator *QFSFileEngine::endEntryList()
{ {
return 0; return 0;
} }
#endif // QT_NO_FILESYSTEMITERATOR
/*! /*!
\internal \internal

4
src/corelib/io/qfsfileengine_iterator.cpp
View File

@ -43,7 +43,7 @@
#include "qfileinfo_p.h" #include "qfileinfo_p.h"
#include "qvariant.h" #include "qvariant.h"
#ifndef QT_NO_FSFILEENGINE #ifndef QT_NO_FILESYSTEMITERATOR
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@ -103,4 +103,4 @@ QFileInfo QFSFileEngineIterator::currentFileInfo() const
QT_END_NAMESPACE QT_END_NAMESPACE
#endif // QT_NO_FSFILEENGINE #endif // QT_NO_FILESYSTEMITERATOR

4
src/corelib/io/qfsfileengine_iterator_p.h
View File

@ -57,7 +57,7 @@
#include "qfilesystemiterator_p.h" #include "qfilesystemiterator_p.h"
#include "qdir.h" #include "qdir.h"
#ifndef QT_NO_FSFILEENGINE #ifndef QT_NO_FILESYSTEMITERATOR
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@ -86,6 +86,6 @@ private:
QT_END_NAMESPACE QT_END_NAMESPACE
#endif // QT_NO_FSFILEENGINE #endif // QT_NO_FILESYSTEMITERATOR
#endif // QFSFILEENGINE_ITERATOR_P_H #endif // QFSFILEENGINE_ITERATOR_P_H

2
src/corelib/io/qfsfileengine_p.h
View File

@ -104,8 +104,10 @@ public:
void setFileName(const QString &file); void setFileName(const QString &file);
int handle() const; int handle() const;
#ifndef QT_NO_FILESYSTEMITERATOR
Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames); Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames);
Iterator *endEntryList(); Iterator *endEntryList();
#endif
qint64 read(char *data, qint64 maxlen); qint64 read(char *data, qint64 maxlen);
qint64 readLine(char *data, qint64 maxlen); qint64 readLine(char *data, qint64 maxlen);