From 921eaf6bf3a1420ff9ce8f797c60247da80110ab Mon Sep 17 00:00:00 2001
From: mread <qt-info@nokia.com>
Date: Mon, 10 Aug 2009 09:37:48 +0100
Subject: moved declaration of engine to better match merge and to remove
 warning

---
 src/corelib/io/qdiriterator.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/corelib/io/qdiriterator.cpp b/src/corelib/io/qdiriterator.cpp
index a91c112..2039827 100644
--- a/src/corelib/io/qdiriterator.cpp
+++ b/src/corelib/io/qdiriterator.cpp
@@ -124,6 +124,8 @@ public:
     void checkAndPushDirectory(const QFileInfo &);
     bool matchesFilters(const QString &fileName, const QFileInfo &fi) const;
 
+    QScopedPointer<QAbstractFileEngine> engine;
+
     const QString path;
     const QStringList nameFilters;
     const QDir::Filters filters;
@@ -133,7 +135,6 @@ public:
     QVector<QRegExp> nameRegExps;
 #endif
 
-    QScopedPointer<QAbstractFileEngine> engine;
     QDirIteratorPrivateIteratorStack fileEngineIterators;
     QFileInfo currentFileInfo;
     QFileInfo nextFileInfo;
-- 
cgit v0.12