Merge branch 'qdoc-simplified' into mimir-simplified

Conflicts:
	tools/qdoc3/atom.h
	tools/qdoc3/qdoc3.pro

1 files changed, 31 insertions, 31 deletions

diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/usingRepeater.qml b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/usingRepeater.qml
index 3365d40..365c25f 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/usingRepeater.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/usingRepeater.qml
@@ -10,126 +10,126 @@ VisualTest {
     }
     Frame {
         msec: 32
-        hash: "1a396cf01a6c31155609532654653599"
+        hash: "e76f50af76d6ee5925b183f9e2316b78"
     }
     Frame {
         msec: 48
-        hash: "1a396cf01a6c31155609532654653599"
+        hash: "e76f50af76d6ee5925b183f9e2316b78"
     }
     Frame {
         msec: 64
-        hash: "1a396cf01a6c31155609532654653599"
+        hash: "e76f50af76d6ee5925b183f9e2316b78"
     }
     Frame {
         msec: 80
-        hash: "1a396cf01a6c31155609532654653599"
+        hash: "e76f50af76d6ee5925b183f9e2316b78"
     }
     Frame {
         msec: 96
-        hash: "1a396cf01a6c31155609532654653599"
+        hash: "e76f50af76d6ee5925b183f9e2316b78"
     }
     Frame {
         msec: 112
-        hash: "1a396cf01a6c31155609532654653599"
+        hash: "e76f50af76d6ee5925b183f9e2316b78"
     }
     Frame {
         msec: 128
-        hash: "1a396cf01a6c31155609532654653599"
+        hash: "e76f50af76d6ee5925b183f9e2316b78"
     }
     Frame {
         msec: 144
-        hash: "1a396cf01a6c31155609532654653599"
+        hash: "e76f50af76d6ee5925b183f9e2316b78"
     }
     Frame {
         msec: 160
-        hash: "1a396cf01a6c31155609532654653599"
+        hash: "e76f50af76d6ee5925b183f9e2316b78"
     }
     Frame {
         msec: 176
-        hash: "1a396cf01a6c31155609532654653599"
+        hash: "e76f50af76d6ee5925b183f9e2316b78"
     }
     Frame {
         msec: 192
-        hash: "1a396cf01a6c31155609532654653599"
+        hash: "e76f50af76d6ee5925b183f9e2316b78"
     }
     Frame {
         msec: 208
-        hash: "1a396cf01a6c31155609532654653599"
+        hash: "e76f50af76d6ee5925b183f9e2316b78"
     }
     Frame {
         msec: 224
-        hash: "1a396cf01a6c31155609532654653599"
+        hash: "e76f50af76d6ee5925b183f9e2316b78"
     }
     Frame {
         msec: 240
-        hash: "1a396cf01a6c31155609532654653599"
+        hash: "e76f50af76d6ee5925b183f9e2316b78"
     }
     Frame {
         msec: 256
-        hash: "1a396cf01a6c31155609532654653599"
+        hash: "e76f50af76d6ee5925b183f9e2316b78"
     }
     Frame {
         msec: 272
-        hash: "8a4565aee33d40840bda26b65b6a0d90"
+        hash: "c98a904eb5da750f4cabf787e253b2ec"
     }
     Frame {
         msec: 288
-        hash: "8a4565aee33d40840bda26b65b6a0d90"
+        hash: "c98a904eb5da750f4cabf787e253b2ec"
     }
     Frame {
         msec: 304
-        hash: "8a4565aee33d40840bda26b65b6a0d90"
+        hash: "c98a904eb5da750f4cabf787e253b2ec"
     }
     Frame {
         msec: 320
-        hash: "8a4565aee33d40840bda26b65b6a0d90"
+        hash: "c98a904eb5da750f4cabf787e253b2ec"
     }
     Frame {
         msec: 336
-        hash: "8a4565aee33d40840bda26b65b6a0d90"
+        hash: "c98a904eb5da750f4cabf787e253b2ec"
     }
     Frame {
         msec: 352
-        hash: "8a4565aee33d40840bda26b65b6a0d90"
+        hash: "c98a904eb5da750f4cabf787e253b2ec"
     }
     Frame {
         msec: 368
-        hash: "8a4565aee33d40840bda26b65b6a0d90"
+        hash: "c98a904eb5da750f4cabf787e253b2ec"
     }
     Frame {
         msec: 384
-        hash: "8a4565aee33d40840bda26b65b6a0d90"
+        hash: "c98a904eb5da750f4cabf787e253b2ec"
     }
     Frame {
         msec: 400
-        hash: "8a4565aee33d40840bda26b65b6a0d90"
+        hash: "c98a904eb5da750f4cabf787e253b2ec"
     }
     Frame {
         msec: 416
-        hash: "8a4565aee33d40840bda26b65b6a0d90"
+        hash: "c98a904eb5da750f4cabf787e253b2ec"
     }
     Frame {
         msec: 432
-        hash: "8a4565aee33d40840bda26b65b6a0d90"
+        hash: "c98a904eb5da750f4cabf787e253b2ec"
     }
     Frame {
         msec: 448
-        hash: "8a4565aee33d40840bda26b65b6a0d90"
+        hash: "c98a904eb5da750f4cabf787e253b2ec"
     }
     Frame {
         msec: 464
-        hash: "8a4565aee33d40840bda26b65b6a0d90"
+        hash: "c98a904eb5da750f4cabf787e253b2ec"
     }
     Frame {
         msec: 480
-        hash: "8a4565aee33d40840bda26b65b6a0d90"
+        hash: "c98a904eb5da750f4cabf787e253b2ec"
     }
     Frame {
         msec: 496
-        hash: "8a4565aee33d40840bda26b65b6a0d90"
+        hash: "c98a904eb5da750f4cabf787e253b2ec"
     }
     Frame {
         msec: 512
-        hash: "8a4565aee33d40840bda26b65b6a0d90"
+        hash: "c98a904eb5da750f4cabf787e253b2ec"
     }
 }