From 1c818c34eacd746eb718a4e4f1e60a16f37e0c65 Mon Sep 17 00:00:00 2001
From: Tasuku Suzuki <stasuku@gmail.com>
Date: Sat, 24 Nov 2012 23:45:22 +0900
Subject: [PATCH] Fix build error with QT_NO_FILESYSTEMITERATOR

Change-Id: If39f1077ab1cb126632ea77d998fc279aabbcd5c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
---
 src/corelib/io/qfsfileengine.cpp          | 2 ++
 src/corelib/io/qfsfileengine_iterator.cpp | 4 ++--
 src/corelib/io/qfsfileengine_iterator_p.h | 4 ++--
 src/corelib/io/qfsfileengine_p.h          | 2 ++
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/corelib/io/qfsfileengine.cpp b/src/corelib/io/qfsfileengine.cpp
index b7617333af3..1d3f14f84ef 100644
--- a/src/corelib/io/qfsfileengine.cpp
+++ b/src/corelib/io/qfsfileengine.cpp
@@ -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
diff --git a/src/corelib/io/qfsfileengine_iterator.cpp b/src/corelib/io/qfsfileengine_iterator.cpp
index ccf15bbe028..0579df25fcd 100644
--- a/src/corelib/io/qfsfileengine_iterator.cpp
+++ b/src/corelib/io/qfsfileengine_iterator.cpp
@@ -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
diff --git a/src/corelib/io/qfsfileengine_iterator_p.h b/src/corelib/io/qfsfileengine_iterator_p.h
index d913d9317b8..2ae041ff194 100644
--- a/src/corelib/io/qfsfileengine_iterator_p.h
+++ b/src/corelib/io/qfsfileengine_iterator_p.h
@@ -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
diff --git a/src/corelib/io/qfsfileengine_p.h b/src/corelib/io/qfsfileengine_p.h
index b4eb745df5f..94aa1828a71 100644
--- a/src/corelib/io/qfsfileengine_p.h
+++ b/src/corelib/io/qfsfileengine_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);