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: (46 commits)
  Build and run QElapsedTimer test.
  Fix license headers.
  Add flag to indicate that network sessions are expected on a platform.
  Don't fail unit test when there is no default network configuration.
  Make destructor virtual.
  Optimized QLocale to access system locale on demand.
  Remove unwanted code in f8d5f2594a9b268b9eeecf95b24b23fc940c71ce
  Compile fix on keypad-navigation systems
  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.
  ...

1 files changed, 3 insertions, 2 deletions

diff --git a/src/gui/itemviews/qabstractitemview_p.h b/src/gui/itemviews/qabstractitemview_p.h
index 82fd1a6..fce74f3 100644
--- a/src/gui/itemviews/qabstractitemview_p.h
+++ b/src/gui/itemviews/qabstractitemview_p.h
@@ -56,7 +56,6 @@
 #include "private/qabstractscrollarea_p.h"
 #include "private/qabstractitemmodel_p.h"
 #include "QtGui/qapplication.h"
-#include "QtCore/qdatetime.h"
 #include "QtGui/qevent.h"
 #include "QtGui/qmime.h"
 #include "QtGui/qpainter.h"
@@ -65,6 +64,7 @@
 #include "QtCore/qdebug.h"
 #include "QtGui/qpainter.h"
 #include "QtCore/qbasictimer.h"
+#include "QtCore/qelapsedtimer.h"
 
 #ifndef QT_NO_ITEMVIEWS
 
@@ -390,7 +390,7 @@ public:
 #endif
 
     QString keyboardInput;
-    QTime keyboardInputTime;
+    QElapsedTimer keyboardInputTime;
 
     bool autoScroll;
     QBasicTimer autoScrollTimer;
@@ -419,6 +419,7 @@ public:
 
     bool wrapItemText;
     mutable bool delayedPendingLayout;
+    bool moveCursorUpdatedView;
 
 private:
     mutable QBasicTimer delayedLayout;