Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (38 commits)
  Force qt-zlib to be used for host system when cross compiling.
  qmake: fix to create proper install target in Makefile at first run
  compile fix for Windows
  Fixed focus handling when Qt is embedded into Cocoa app.
  Do not beep on Mac when pressing some keys.
  Do not deliver the same key event multiple times in Cocoa.
  Implement Idle-priority threads for Linux.
  Improved qt_x11_wait_for_window_manager
  Doc: document QElapsedTimer
  Added missing "const" for mac.
  qdoc3: Fixed some ifdef typos and removed some whitespace.
  Manual test for QTBUG-8933.
  Cocoa: minisplitter has only 1px wide grab area
  "Strictly" Fullscreen Application in Mac OS
  Bugfix the Symbian implementation
  Add QDateTime::currentDateTimeUtc and QDateTime::currentMsecsSinceEpoch
  remove, fixup
  Change the 32-bit rollover on Windows and Symbian to be more efficient.
  Add a couple of extra functions to QElapsedTimer
  Autotest: Rename the test to match the new class name
  ...

1 files changed, 3 insertions, 2 deletions

diff --git a/src/gui/dialogs/qfileinfogatherer_p.h b/src/gui/dialogs/qfileinfogatherer_p.h
index eff6b3c..5abcd94 100644
--- a/src/gui/dialogs/qfileinfogatherer_p.h
+++ b/src/gui/dialogs/qfileinfogatherer_p.h
@@ -60,9 +60,10 @@
 #include <qfileiconprovider.h>
 #include <qfsfileengine.h>
 #include <qpair.h>
-#include <qdatetime.h>
 #include <qstack.h>
+#include <qdatetime.h>
 #include <qdir.h>
+#include <qelapsedtimer.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -174,7 +175,7 @@ protected:
     void getFileInfos(const QString &path, const QStringList &files);
 
 private:
-    void fetch(const QFileInfo &info, QTime &base, bool &firstTime, QList<QPair<QString, QFileInfo> > &updatedFiles, const QString &path);
+    void fetch(const QFileInfo &info, QElapsedTimer &base, bool &firstTime, QList<QPair<QString, QFileInfo> > &updatedFiles, const QString &path);
     QString translateDriveName(const QFileInfo &drive) const;
 
     QMutex mutex;