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: (63 commits)
  Revert "Don't emit open signal on session close/error."
  Rename networkAccess property to networkAccessible.
  Don't emit open signal on session close/error.
  Rename private signal.
  Autotest: fix instability by accepting rounding errors
  Dont force height for filter widget
  - Fix importdir option on unix/linux configure
  Remove incorrect semi-colons after Q_PROPERTY
  10n: Update German translation for 4.7.0
  Redesigned filter widgets
  Add a test case for commit 76d767080a6be7b025f36d6778dfaedbd31a9f07
  Add Japanese/Korean keyboard specific keys to QKeySequence
  Fixed qmdiarea autotest regression on Cocoa
  Fix JSC export macros
  Minor update for f3f979cbd37f47892cd0c0a9fc23b802ed6f7890
  Incorrect translation for Application menu items in Mac.
  doc: Fixed use of Qt 3 support function in QIcon doc snippet
  Build and run QElapsedTimer test.
  Fix license headers.
  Add flag to indicate that network sessions are expected on a platform.
  ...

1 files changed, 2 insertions, 2 deletions

diff --git a/src/gui/kernel/qgesture_p.h b/src/gui/kernel/qgesture_p.h
index 649a310..bf60f97 100644
--- a/src/gui/kernel/qgesture_p.h
+++ b/src/gui/kernel/qgesture_p.h
@@ -55,8 +55,8 @@
 
 #include "qrect.h"
 #include "qpoint.h"
-#include "qdatetime.h"
 #include "qgesture.h"
+#include "qelapsedtimer.h"
 #include "private/qobject_p.h"
 
 QT_BEGIN_NAMESPACE
@@ -148,7 +148,7 @@ public:
     QPoint lastPositions[3];
     bool started;
     qreal speed;
-    QTime time;
+    QElapsedTimer time;
 };
 
 class QTapGesturePrivate : public QGesturePrivate