Fix build error with QT_NO_FILESYSTEMITERATOR
Change-Id: If39f1077ab1cb126632ea77d998fc279aabbcd5c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
parent
28389db8a1
commit
1c818c34ea
@ -736,6 +736,7 @@ qint64 QFSFileEnginePrivate::writeFdFh(const char *data, qint64 len)
|
||||
return writtenBytes;
|
||||
}
|
||||
|
||||
#ifndef QT_NO_FILESYSTEMITERATOR
|
||||
/*!
|
||||
\internal
|
||||
*/
|
||||
@ -751,6 +752,7 @@ QAbstractFileEngine::Iterator *QFSFileEngine::endEntryList()
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
#endif // QT_NO_FILESYSTEMITERATOR
|
||||
|
||||
/*!
|
||||
\internal
|
||||
|
@ -43,7 +43,7 @@
|
||||
#include "qfileinfo_p.h"
|
||||
#include "qvariant.h"
|
||||
|
||||
#ifndef QT_NO_FSFILEENGINE
|
||||
#ifndef QT_NO_FILESYSTEMITERATOR
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
@ -103,4 +103,4 @@ QFileInfo QFSFileEngineIterator::currentFileInfo() const
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#endif // QT_NO_FSFILEENGINE
|
||||
#endif // QT_NO_FILESYSTEMITERATOR
|
||||
|
@ -57,7 +57,7 @@
|
||||
#include "qfilesystemiterator_p.h"
|
||||
#include "qdir.h"
|
||||
|
||||
#ifndef QT_NO_FSFILEENGINE
|
||||
#ifndef QT_NO_FILESYSTEMITERATOR
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
@ -86,6 +86,6 @@ private:
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#endif // QT_NO_FSFILEENGINE
|
||||
#endif // QT_NO_FILESYSTEMITERATOR
|
||||
|
||||
#endif // QFSFILEENGINE_ITERATOR_P_H
|
||||
|
@ -104,8 +104,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);
|
||||
|
Loading…
Reference in New Issue
Block a user