Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (58 commits)
  Fine-tune the tests being run on the CI system.
  Standardize selection color in visual test
  Use GLIBC functions on any GLIBC architecture.
  tst_qnetworkreply: Fix ugly test
  Fix license text.
  Remove pointSize from visual tests
  Update visuals for X11
  Doc: fix a typo in QML/Qt UI integration
  Added missing symbols in QtCore and QtGui def files needed by fix made to QT-4077
  Fix regression due to 6cf397f7ac35a058096528a7ad8bfaf623b30747
  Remove some excess pngs
  Update qml visual tests
  VisualDataModel::count should be 0 until a valid delegate is set.
  Doc: Remove default from PathView path property
  Record images on more than just the first frame.
  Turn off font antialiasing during tests.
  Shrink size of a visual test
  doc: Fix documentation of QTextEdit::setDocument
  Fixed QGesture autotest for QGesture lazy deletion.
  compile with quintptr instead of intptr_t
  ...

1 files changed, 5 insertions, 5 deletions

diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/clock.qml b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/clock.qml
index a3cd66b..2e8337e 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/clock.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/clock.qml
@@ -6,7 +6,7 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "cb33c89e5108c85e43b53489d1255862"
+        image: "clock.0.png"
     }
     Frame {
         msec: 32
@@ -242,11 +242,11 @@ VisualTest {
     }
     Frame {
         msec: 960
-        image: "clock.0.png"
+        hash: "2ff4e8f394a62892adb348271435205c"
     }
     Frame {
         msec: 976
-        hash: "2ff4e8f394a62892adb348271435205c"
+        image: "clock.1.png"
     }
     Frame {
         msec: 992
@@ -482,11 +482,11 @@ VisualTest {
     }
     Frame {
         msec: 1920
-        image: "clock.1.png"
+        hash: "a3e6173e6d82d2cb52149588b32851e4"
     }
     Frame {
         msec: 1936
-        hash: "a3e6173e6d82d2cb52149588b32851e4"
+        image: "clock.2.png"
     }
     Frame {
         msec: 1952