Merge branch 'qdoc-simplified' into mimir-simplified

Conflicts:
	doc/src/platforms/compiler-notes.qdoc
	tools/qdoc3/ditaxmlgenerator.cpp
	tools/qdoc3/ditaxmlgenerator.h
	tools/qdoc3/htmlgenerator.cpp
	tools/qdoc3/htmlgenerator.h
	tools/qdoc3/node.cpp
	tools/qdoc3/pagegenerator.h

6 files changed, 198 insertions, 197 deletions

diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeparticles/data/particles.0.png b/tests/auto/declarative/qmlvisual/qdeclarativeparticles/data/particles.0.png
index 7321d95..88924b1 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativeparticles/data/particles.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeparticles/data/particles.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeparticles/data/particles.1.png b/tests/auto/declarative/qmlvisual/qdeclarativeparticles/data/particles.1.png
index 49d2a5a..024a17c 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativeparticles/data/particles.1.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeparticles/data/particles.1.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeparticles/data/particles.2.png b/tests/auto/declarative/qmlvisual/qdeclarativeparticles/data/particles.2.png
index 6fe14b7..8860fc2 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativeparticles/data/particles.2.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeparticles/data/particles.2.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeparticles/data/particles.3.png b/tests/auto/declarative/qmlvisual/qdeclarativeparticles/data/particles.3.png
new file mode 100644
index 0000000..2ab8ee3
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeparticles/data/particles.3.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeparticles/data/particles.qml b/tests/auto/declarative/qmlvisual/qdeclarativeparticles/data/particles.qml
index 463edf8..2930e28 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativeparticles/data/particles.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeparticles/data/particles.qml
@@ -6,770 +6,770 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "b4df49cbd7cf972af9879399808f6c53"
+        image: "particles.0.png"
     }
     Frame {
         msec: 32
-        hash: "43c0ad5826e8058260951f063f0851ab"
+        hash: "c7eb3936886726f584d1bd99133a199f"
     }
     Frame {
         msec: 48
-        hash: "55eb2c9939514338e7ef58c9276fc223"
+        hash: "f7f6eeab119435f0cccd55074b4941bf"
     }
     Frame {
         msec: 64
-        hash: "6a1bbb91bf450547d6100b6e61a98f6d"
+        hash: "06f52743e61bf0212971652c500fe5d1"
     }
     Frame {
         msec: 80
-        hash: "bdb9b8cab70c72d99aba830eb8e8913b"
+        hash: "1f9dd3a3a0524c60791362f560936f9b"
     }
     Frame {
         msec: 96
-        hash: "71a0e046bc68183b830df9dafd8fa147"
+        hash: "42538495fc9d63384a1709476c06d750"
     }
     Frame {
         msec: 112
-        hash: "e7228e0ed77e05c661282c2d2fe88b3e"
+        hash: "4d1b53541ffe5cdfcf0e3aa2916b1bac"
     }
     Frame {
         msec: 128
-        hash: "93a4c3e501b05844f687a2dd1754aad2"
+        hash: "6a3a683dbd2ad7c89f0788441303485e"
     }
     Frame {
         msec: 144
-        hash: "1856ac86313c16bf4874130d9a48ff45"
+        hash: "125a936660dae42969fab4144d166ac6"
     }
     Frame {
         msec: 160
-        hash: "3637d8dad4f44c938f91b0800bd9fb2f"
+        hash: "87d008547326ff1bf2c4c2a9d9b99abc"
     }
     Frame {
         msec: 176
-        hash: "c5ace4ede38d29363d69c6b4b2f9349f"
+        hash: "0df69d85b37d3ebf0e314a7e89701703"
     }
     Frame {
         msec: 192
-        hash: "a5d832d02f4a635052817654df90caba"
+        hash: "7af12cac3bd33c903d6aa6fa8f89b498"
     }
     Frame {
         msec: 208
-        hash: "9ebf8bea8abe7ac209d47214a87f8fc0"
+        hash: "424c950111c492ded19df874b938067c"
     }
     Frame {
         msec: 224
-        hash: "35b8f5cb18284867be8d27d601394a2b"
+        hash: "bee69a0df1ca8ccc7d83a52f9de34f8c"
     }
     Frame {
         msec: 240
-        hash: "a2c4a6063f219af6f2b29b2d21a4265d"
+        hash: "47da1538d818e22d836de57d5c6601ce"
     }
     Frame {
         msec: 256
-        hash: "27f25ace7b8e93c55638ed99f49b821c"
+        hash: "fbfb0e177b19d6ef9433619f60dd9580"
     }
     Frame {
         msec: 272
-        hash: "4f6511bfbbd8113195a7597eb6dfb219"
+        hash: "23b4f8bb116e8db48db25ccccedba43a"
     }
     Frame {
         msec: 288
-        hash: "6a696159cdbb51a67064c600124535d1"
+        hash: "13f0847f1b86f880690692066cde21c7"
     }
     Frame {
         msec: 304
-        hash: "6cd667eb352256dbb728532634e7ffd0"
+        hash: "639ca4c978bea080139b219c75bf01d1"
     }
     Frame {
         msec: 320
-        hash: "28fa16c8936bf86a8426ded306aa2b8c"
+        hash: "19debcaa7bbde930eda2fd08ac1e9d8a"
     }
     Frame {
         msec: 336
-        hash: "061fecdb88733e3e51c5823571bc4d19"
+        hash: "1d733c5010604bff67138f1eb9881dcd"
     }
     Frame {
         msec: 352
-        hash: "f64530f638b3d18d56593e0b7c884f5d"
+        hash: "b14435e41a3730baff06bb0800157081"
     }
     Frame {
         msec: 368
-        hash: "8530cf40739890dc7401fad65a6325bf"
+        hash: "504b3548c38d50f15235594f3f3d7be5"
     }
     Frame {
         msec: 384
-        hash: "0abc555552e7256dbc424b2eac5c95f2"
+        hash: "4e73ef73c949da579217c1d94139a75a"
     }
     Frame {
         msec: 400
-        hash: "64aeae59a8c958dfc62d92636b2f5217"
+        hash: "5fced44782484b1962368b9c04bf5246"
     }
     Frame {
         msec: 416
-        hash: "3e0f50f5bee017220b129d06b2acde2c"
+        hash: "6ab0cd5c14e1871a35d003574255c1db"
     }
     Frame {
         msec: 432
-        hash: "e676c01ff2e35bdfe674be67d49945b1"
+        hash: "23f5c485fbd0acd607119e93277284db"
     }
     Frame {
         msec: 448
-        hash: "bc060b480aab94fd440fd27f5beb7383"
+        hash: "02ebd53ee0e6ca3605916b05d827989e"
     }
     Frame {
         msec: 464
-        hash: "79c79f723de72315e63da8a7cbe1b425"
+        hash: "99b1d1e72d7da88a7d5d5a7907e1b1f4"
     }
     Frame {
         msec: 480
-        hash: "7bf93c2697af75d0f862a47d57cd6a7f"
+        hash: "b7de7d40263f2811ec51f28f8ff4929c"
     }
     Frame {
         msec: 496
-        hash: "7641b9e233f4aabd99bcd985ce1d51ae"
+        hash: "e64059f850dd4c8642a9883a1c5356bf"
     }
     Frame {
         msec: 512
-        hash: "b596a28cb67617d37408bd25d947d088"
+        hash: "b0aefb8f8d4d970ba4b51d7f77b55cf1"
     }
     Frame {
         msec: 528
-        hash: "f2c5cdf15c27b05c0ea97675ddc41757"
+        hash: "5ab4b1373c233b2342eb66cf9eccac8d"
     }
     Frame {
         msec: 544
-        hash: "eae5eb8c41a1d6d75446618518490f20"
+        hash: "b3726c296d5919a59c32201d857e92b4"
     }
     Frame {
         msec: 560
-        hash: "0be5e9a6d857fe1a262524801c69490d"
+        hash: "70e246371f9cf83b5913f2fc53f6b736"
     }
     Frame {
         msec: 576
-        hash: "65478b8c4d932c10924f70462a662254"
+        hash: "871cd4b99b6d544d487424219e0caf92"
     }
     Frame {
         msec: 592
-        hash: "7b034f3c98e8eb38eec11cf3c2aa0804"
+        hash: "8c002ec15e88220bf12ebaa5a3390570"
     }
     Frame {
         msec: 608
-        hash: "5bbc8eed41500ccbc820cfb38794232f"
+        hash: "21c994a5ad23938a9e873d04bbd4165e"
     }
     Frame {
         msec: 624
-        hash: "1b39d555ca8932b40efd769c4ba74d3f"
+        hash: "1f04a0ed31823cd0817f3e97a11e3a46"
     }
     Frame {
         msec: 640
-        hash: "f9a38e12becbce400191e22f1d22427c"
+        hash: "f163eda68878ae0ed4cac7f941e24414"
     }
     Frame {
         msec: 656
-        hash: "cbc27c72517d76edfc2d3692cd83f151"
+        hash: "560527d6c7fa64a4739f9c79f3eaab8f"
     }
     Frame {
         msec: 672
-        hash: "4a883a5aed05f0bbcefcefea6ef56df6"
+        hash: "df7e7469ff685c4cd822232b1aa66029"
     }
     Frame {
         msec: 688
-        hash: "7a30ea30c0619c87c96bcaba916c64df"
+        hash: "fa92bf73b0737d4ac8bbc16518cd9c2a"
     }
     Frame {
         msec: 704
-        hash: "33cd0797b6d229592ed53117fcaaa898"
+        hash: "bb2f2765ba20b727701352f11ed30417"
     }
     Frame {
         msec: 720
-        hash: "21178ef9366c8a65ecb9e21d584573b0"
+        hash: "4c45617ce77a5869cdbfcfe851796422"
     }
     Frame {
         msec: 736
-        hash: "fe75beac8681fdac8a2b79c9c7267128"
+        hash: "24aa2eabe8d2a4adc5a096dd201a3bc1"
     }
     Frame {
         msec: 752
-        hash: "df26a23d394e053417de86309683c5e0"
+        hash: "2eb5de2524ad38e1dcd44d89b115e75a"
     }
     Frame {
         msec: 768
-        hash: "411594a1ed7c351cb872e0a6f3081b1b"
+        hash: "8b39e542908051b0ab8fbf3cd36f3be9"
     }
     Frame {
         msec: 784
-        hash: "b4b639f204cfed9e1fec872e4de115c2"
+        hash: "a447e9d7c87c90633dcfc550fcf04ff6"
     }
     Frame {
         msec: 800
-        hash: "4d801e2f4848399c011d60264720b912"
+        hash: "c3d1e7753b592bc0d0c3169e3cf08bb7"
     }
     Frame {
         msec: 816
-        hash: "4f28c7b154853ff78cdefb5a5ac9d2b7"
+        hash: "fb20ccb3b36798835fbc1d529a7424ea"
     }
     Frame {
         msec: 832
-        hash: "cc6d4283b0d7bf9f579637575d5e1fef"
+        hash: "ff253670ae78826250b9612cf2a2e1a4"
     }
     Frame {
         msec: 848
-        hash: "8edc371d23d01be547990074b5e640af"
+        hash: "45fb7f71debd3b61062a4165c04c0637"
     }
     Frame {
         msec: 864
-        hash: "874845d7178e6cd8369f21379060f561"
+        hash: "a1542b5bc5e65cdb3f8775cf21b54429"
     }
     Frame {
         msec: 880
-        hash: "98fb6d79990775385603fb1a50ab5186"
+        hash: "a146b5b88875e4148658dd55e162d6f4"
     }
     Frame {
         msec: 896
-        hash: "d15539efc27baabb5a74f464b152d266"
+        hash: "94222050206925d4c9b38da03125cc0c"
     }
     Frame {
         msec: 912
-        hash: "fc44d091d6689e8870162a6d29b6d287"
+        hash: "71a63ace8450029b968723cfa684330c"
     }
     Frame {
         msec: 928
-        hash: "a3c964f4bf524e22092b1650df43375a"
+        hash: "14e4d2af07146133c6a0e87391747c6a"
     }
     Frame {
         msec: 944
-        hash: "ca203fd630ec1eadea37cf36bd30ba40"
+        hash: "e380593e219531620dbca0a8131b4f13"
     }
     Frame {
         msec: 960
-        image: "particles.0.png"
+        hash: "d52c30bc201afd3d1caf34efcddafdee"
     }
     Frame {
         msec: 976
-        hash: "2e0630818c04fc6c259eec8561c645cd"
+        image: "particles.1.png"
     }
     Frame {
         msec: 992
-        hash: "a7b1f6305ddcf4a338e1a96ea31a5341"
+        hash: "0d2871475891f96e1cc4150cbe725d46"
     }
     Frame {
         msec: 1008
-        hash: "23a5013a8f9407d06ac6fd0c1e961743"
+        hash: "b6d064a26c282ce4fd8cba48de0a0f7b"
     }
     Frame {
         msec: 1024
-        hash: "9de73decddaab4269bd33efdb21278a3"
+        hash: "9ad67d9833d749b2b8158abb3076357b"
     }
     Frame {
         msec: 1040
-        hash: "7582c26b45dd11c262f51b387af89cb2"
+        hash: "ce86624a1e055fdb4711dd73be31dc42"
     }
     Frame {
         msec: 1056
-        hash: "650e0d395f1d1f2ddda8711089d85511"
+        hash: "a2c6fc81e1f02477f6ad084acaf12b0d"
     }
     Frame {
         msec: 1072
-        hash: "9ff84e81219aa6bb7ab534b2a47a3930"
+        hash: "bab24924a5ac4cd45c1fa7b5e4ff3efe"
     }
     Frame {
         msec: 1088
-        hash: "11e255273e8ca4716047fb52636f0c3e"
+        hash: "8c8fd3b9cc257dab84df8e88a3e7a001"
     }
     Frame {
         msec: 1104
-        hash: "b2fcbefd13db3c765183b1eefc2ca0bc"
+        hash: "a3f9936dc4e3161d9db1fa39267cda4d"
     }
     Frame {
         msec: 1120
-        hash: "7150aff523c0d480702f6a326699cb65"
+        hash: "d6669c8a47077f665a93587ea3cafe6e"
     }
     Frame {
         msec: 1136
-        hash: "63886c15107a2a7d639069cd81c3cd07"
+        hash: "601dbd220a7f312d4343323ae99e21ee"
     }
     Frame {
         msec: 1152
-        hash: "1ec1fc30bbb5f43a1d6d36bce345f569"
+        hash: "722411ffc1d6740caed9bf1231bc54ba"
     }
     Frame {
         msec: 1168
-        hash: "34060cbc31ce1fbf406cbb595312c609"
+        hash: "cb3bd6f5ee770399e21a07e56dcf28ef"
     }
     Frame {
         msec: 1184
-        hash: "6f3a04c7f411785956e640aa630f7ac4"
+        hash: "1819d6719e6b56b3e673dacf1865272e"
     }
     Frame {
         msec: 1200
-        hash: "d7bdb7e170b6f193eaf4b07c01b4dc6b"
+        hash: "6b6532937a3e37df28b3939cbadc4741"
     }
     Frame {
         msec: 1216
-        hash: "6ca02c0d9cfeb4b1932f7ad1feac9850"
+        hash: "8a065d54600e9ae3c7958f7b71d8432d"
     }
     Frame {
         msec: 1232
-        hash: "d446c7b185361de5c615a17ac1fee607"
+        hash: "2259806ac264b292f5701f34ffac5c35"
     }
     Frame {
         msec: 1248
-        hash: "bc2faf5b7b2972f155954e4e685e80ae"
+        hash: "e4b2a6440df9141616f89cbb6a6ba0aa"
     }
     Frame {
         msec: 1264
-        hash: "2bf26cedc76aea4a6d9744b7dd935db8"
+        hash: "034b74fe5327909214bb5a6e3084edf2"
     }
     Frame {
         msec: 1280
-        hash: "accbee9d0f8cf73ef72aa7bfb49b3fa5"
+        hash: "976fd9bc54baefe8d71002a22706052a"
     }
     Frame {
         msec: 1296
-        hash: "933eb2e46f42e212bdfc515d30f663d3"
+        hash: "45138388ebc6ec44a205934475907b25"
     }
     Frame {
         msec: 1312
-        hash: "7495318c893dbb22771b53e93c7614e8"
+        hash: "01edec5ae6e33b49baee2abe2a59ad7d"
     }
     Frame {
         msec: 1328
-        hash: "894fe23c1b3543451293c047b640c4bb"
+        hash: "9a89ff95df027e53827c5554a28e05a8"
     }
     Frame {
         msec: 1344
-        hash: "9b7179ef059ee82ca4a383f536f47a42"
+        hash: "8d1cd8a1181b7320990b7348b424ce4b"
     }
     Frame {
         msec: 1360
-        hash: "5ec1a5bfac2473efdcad7dba0da4015c"
+        hash: "2366d1ee0c0740f0d19fe2ce1acfe4c3"
     }
     Frame {
         msec: 1376
-        hash: "2bd64528e83260a80e7f2843e2c34a19"
+        hash: "071988963ab2d1a53243e0f6837fecb0"
     }
     Frame {
         msec: 1392
-        hash: "16bf64a9bf6b4bc09b108c65d074b5f2"
+        hash: "20f1e8adef04cea6bcd1511ac47a7922"
     }
     Frame {
         msec: 1408
-        hash: "c33eaa717ba63655f375499058b1be55"
+        hash: "2241def30a3ef54ea82e5fa2b1ef5997"
     }
     Frame {
         msec: 1424
-        hash: "d080f4591f9fd59745bf850525590849"
+        hash: "15365370ac6859f1bfc76e96e603c417"
     }
     Frame {
         msec: 1440
-        hash: "921585c88ec133c83c07650745bb4441"
+        hash: "45edcbeb23c88f62982f9af9a4647f4c"
     }
     Frame {
         msec: 1456
-        hash: "f037b28137b22a0c91fc71fc6626475a"
+        hash: "b7a9c7c44e6f9ff5132d1ad3f6137dc8"
     }
     Frame {
         msec: 1472
-        hash: "e10b3c432a230d5509c2fa7df48b56c9"
+        hash: "8a55b85fdd63ac63c1a566a5c4d92a04"
     }
     Frame {
         msec: 1488
-        hash: "ac02c7b7e68ee8cfad1fe556020e93d8"
+        hash: "e1973b7d557dec08e6375feefb56db47"
     }
     Frame {
         msec: 1504
-        hash: "12d59e70dedfa0c741afed9b98cb9a3a"
+        hash: "a321445212e561de4262228482b0edbe"
     }
     Frame {
         msec: 1520
-        hash: "a9aa635ccde26829d7e1cdc29fcce8d1"
+        hash: "a2c787a576e1f85561c08330b6801e98"
     }
     Frame {
         msec: 1536
-        hash: "f571b3da827b884ad036dade8ad2fe37"
+        hash: "ba84070f0081d4c7a08ebc3204d9aebf"
     }
     Frame {
         msec: 1552
-        hash: "1ffa8d7512e9001cbc78b28451133b44"
+        hash: "4b82a6908ed0caf3cbfd9dc9211ec69a"
     }
     Frame {
         msec: 1568
-        hash: "2ef4b10f2eafd71dfde15f7f00e923c6"
+        hash: "a1dc7c4ad596fc005cf3077ee78406e1"
     }
     Frame {
         msec: 1584
-        hash: "09b3bc232a134eae5ae14c0336f508ba"
+        hash: "53d76884202d4b9ce3874db796705b80"
     }
     Frame {
         msec: 1600
-        hash: "ebadb5c6b4986c865f7f8ef232680b7e"
+        hash: "9f24c090531259f9d83ea97e842c4f14"
     }
     Frame {
         msec: 1616
-        hash: "26621991073510e9a95e3b208e3ee56e"
+        hash: "541c81585a781bab82d4ee95b9f844ff"
     }
     Frame {
         msec: 1632
-        hash: "f18e97f13c06f3c5368edf851f19f401"
+        hash: "73e15141e6c6bfba4a2c820ba96e3f6e"
     }
     Frame {
         msec: 1648
-        hash: "3c322dbbf5ecfe1de56595dcb7d949e1"
+        hash: "0500129b602ab14925aa09a1d9bee3d0"
     }
     Frame {
         msec: 1664
-        hash: "50058d1bb992a6d0601c9d5490149936"
+        hash: "2d45ba5e0e21430f468332c13ce3ee15"
     }
     Frame {
         msec: 1680
-        hash: "4cc78f56f13478ec21a4a0d6b22f956b"
+        hash: "bafd11c210e683d79ac438c5612503bc"
     }
     Frame {
         msec: 1696
-        hash: "d765cd86560dff3faa5a3c902512c74c"
+        hash: "f968f49e6a0674877c55282e5543edab"
     }
     Frame {
         msec: 1712
-        hash: "ad983068c2149b0c06da3b89a5d94d24"
+        hash: "705307529862a3825a0870b294058825"
     }
     Frame {
         msec: 1728
-        hash: "e6da7260001771fc00c472bccae641fe"
+        hash: "a008a501d1dc16a5ffaee325fdd90816"
     }
     Frame {
         msec: 1744
-        hash: "71778ad8a61ecb0f78f7234ecf0d1d97"
+        hash: "5091621481873738658f4d8543582c62"
     }
     Frame {
         msec: 1760
-        hash: "6b2209ea5f7f17c2cd868986f0c907d9"
+        hash: "141216eeb31b5af4ec247bb930169a7f"
     }
     Frame {
         msec: 1776
-        hash: "6513c82829ef7e7c9461dcf5b50f675f"
+        hash: "bfb203e39ab0a9837fc5b9c9b49d9580"
     }
     Frame {
         msec: 1792
-        hash: "0172c5bdf96c8bceab25a6c82bdbe527"
+        hash: "1f2704480af7dd2bb382d13450f34755"
     }
     Frame {
         msec: 1808
-        hash: "64b53bf1c1988d3a799b564089f8e63f"
+        hash: "f3182da7f6202250a6cc2de3e43fcf87"
     }
     Frame {
         msec: 1824
-        hash: "a1bdea4771ec9719cfe88f4e827bd005"
+        hash: "6fa500f5ff387c5801186fb7eced96f4"
     }
     Frame {
         msec: 1840
-        hash: "263de376cee2ba7701a7ca116bc1be81"
+        hash: "1874d59911d70daf098cd053da69127b"
     }
     Frame {
         msec: 1856
-        hash: "9795dada7f09d7d4d40df858dea8bc70"
+        hash: "52a7bcb9a18e8d4a24c2617124b7961b"
     }
     Frame {
         msec: 1872
-        hash: "85ea4c63fc31f79423cb509f6c6d4faa"
+        hash: "f3a7dd26aa4177dbee02d52df664c751"
     }
     Frame {
         msec: 1888
-        hash: "c86d8c4460d1e3c2f26b723dc628fe84"
+        hash: "5180db29e325f00c3940b6a7b8eb8a8e"
     }
     Frame {
         msec: 1904
-        hash: "6bf6ef1fd377bfcf0b93baa7f28e1d3d"
+        hash: "eab16b6ef76e627eff492cdf5d5da9e2"
     }
     Frame {
         msec: 1920
-        image: "particles.1.png"
+        hash: "57976a66963718e90c62535a936d9251"
     }
     Frame {
         msec: 1936
-        hash: "57b8a48bed9375b74391950c28e611da"
+        image: "particles.2.png"
     }
     Frame {
         msec: 1952
-        hash: "70203655bc832998529071d7f665ecbe"
+        hash: "85ecf35d439bd4129f8780d8ee561dfb"
     }
     Frame {
         msec: 1968
-        hash: "9ab9808d495f907a255d85fbd82491e2"
+        hash: "785d712b57b3ec4cee6b9e2fcfa1b775"
     }
     Frame {
         msec: 1984
-        hash: "297570136b058ba43e883b0aef20d82f"
+        hash: "77906acfafec6ab595e8dad00373f953"
     }
     Frame {
         msec: 2000
-        hash: "0c2f15ce83e2d961ec36299b13890709"
+        hash: "33722e5c66ee6dfc87ca62a53590969e"
     }
     Frame {
         msec: 2016
-        hash: "6d57b6dcb1dbfa35245d79ef36ca49b2"
+        hash: "7bd3d9e36789b3456c5e098d02341ce3"
     }
     Frame {
         msec: 2032
-        hash: "12a71804fd71991706d8a39b676d1628"
+        hash: "be4af661ca19ca607acf0d8949b58c26"
     }
     Frame {
         msec: 2048
-        hash: "f6a9e1b0b498fc576f3eadeb86c08fe9"
+        hash: "e249df985887229664d3c61c7b01d2ef"
     }
     Frame {
         msec: 2064
-        hash: "051c2ed34cbef82d44aec4841a33f086"
+        hash: "541a01af440e81c7b20fa9df0e85f5f9"
     }
     Frame {
         msec: 2080
-        hash: "12b89590b20fff8d6c94dde40a5d6185"
+        hash: "3579e5a3ab93b8c9998ef812f43ba158"
     }
     Frame {
         msec: 2096
-        hash: "7a29cd11ddb042203465a9522ff951ce"
+        hash: "c2902c8068a48788e5511d2987191181"
     }
     Frame {
         msec: 2112
-        hash: "4853f364261ab8e1c9d35cfe42efb385"
+        hash: "3fc7d417d13cbccbff81c0630cf968f3"
     }
     Frame {
         msec: 2128
-        hash: "7149ab3ed649cac9cf662be7c434056f"
+        hash: "5507fabe77585c38b2929e2565cd8e9d"
     }
     Frame {
         msec: 2144
-        hash: "bbe199700474dda156355d31ac09be39"
+        hash: "73f6a9a1602929b80ba28ac2c8095a95"
     }
     Frame {
         msec: 2160
-        hash: "a3f3fbbe844b8c6fb8cb8bbcc17120e3"
+        hash: "3377ee6818f1fbf15cfe2916ef7328ed"
     }
     Frame {
         msec: 2176
-        hash: "e9a04cfe9e8c50f74978fbd4ecce536a"
+        hash: "4bea4237a5044b9ffbe9815b877a5b96"
     }
     Frame {
         msec: 2192
-        hash: "0df1d4211f770cdd7b8a98ea476c6f42"
+        hash: "f25dadf7b916625f120d3b5fc1602d0d"
     }
     Frame {
         msec: 2208
-        hash: "a6837afb43663b9473db2378b1a9f989"
+        hash: "ba095d86b7ecc9e2ca6c5d6567d6debf"
     }
     Frame {
         msec: 2224
-        hash: "691ea67f3b84b8dda449c2a8e86b1087"
+        hash: "296129caee6a9526aa2c6071fb07198c"
     }
     Frame {
         msec: 2240
-        hash: "16d18947637c63662b9a502c493f06ec"
+        hash: "42abe26548e9eb7a2c63aea7f349808c"
     }
     Frame {
         msec: 2256
-        hash: "8f9207d404da08706e150f3b64d0088d"
+        hash: "2d187394342584568aa24353233f67f7"
     }
     Frame {
         msec: 2272
-        hash: "48ad430e38cdc34845a834cfb9ea70ef"
+        hash: "5c4047c8ca78103d443f9058f3ec3237"
     }
     Frame {
         msec: 2288
-        hash: "1252cfb294ae99c40b03dd021160553f"
+        hash: "05af8a131ec98b5bc60669bfcdee9a16"
     }
     Frame {
         msec: 2304
-        hash: "b1d5e752fbe03c95ee0dc7bbdf6fb9f6"
+        hash: "b486a796a74962d6b5a4e928ff9e6a2d"
     }
     Frame {
         msec: 2320
-        hash: "2282cb42ef0c812ba27e33ed0f962a84"
+        hash: "8bfa5cc3edf294a728bae51014733230"
     }
     Frame {
         msec: 2336
-        hash: "42fc82c8d40d383b3cf31a741a4358c5"
+        hash: "fb5928a74d75f7eb23ed914e12ea2dba"
     }
     Frame {
         msec: 2352
-        hash: "368c1ffa2deb1911929f1769e31c8017"
+        hash: "16c83f70c3559e97c4a28df7e8b94d95"
     }
     Frame {
         msec: 2368
-        hash: "8693bdbde404e36970943ac6b650ca00"
+        hash: "a7f926210d56dc368c99da12a27db42e"
     }
     Frame {
         msec: 2384
-        hash: "57609613c336029b60da428d48842a4e"
+        hash: "9f235f259af00126a3fc2417d399dee6"
     }
     Frame {
         msec: 2400
-        hash: "b61dafe9e87421d3fcf8cb9ff0e7a41b"
+        hash: "2397c99cc1697303bad9fbd029ee63a3"
     }
     Frame {
         msec: 2416
-        hash: "c8c34d1d82bef418ef97f52cb9773cf4"
+        hash: "b83a021c82c203d6cf690edd5fd98c89"
     }
     Frame {
         msec: 2432
-        hash: "aa756c09717dc02e81e76511b4c58f60"
+        hash: "4e9e74f8b115b69b593f0233f9431258"
     }
     Frame {
         msec: 2448
-        hash: "96e75c5ce1b5393f6cc46fbbe0a67689"
+        hash: "2d8f24eea1e87691eb2292bd01756498"
     }
     Frame {
         msec: 2464
-        hash: "fb5febae411f43a6cd218b03b36f5018"
+        hash: "bad7ffbfe4feac5e7a13a70c8096ddab"
     }
     Frame {
         msec: 2480
-        hash: "889870fa67784261e7b73b7d0a53324e"
+        hash: "6869d23bf601c67593f23402023f931d"
     }
     Frame {
         msec: 2496
-        hash: "fb124d4ebee6457f2137f07954619912"
+        hash: "6e4846623fe8b4a1c850729620cd7502"
     }
     Frame {
         msec: 2512
-        hash: "258ae87f78805c555e0ed802c5123eeb"
+        hash: "f679d87f206ca71de191f3991c13f4b0"
     }
     Frame {
         msec: 2528
-        hash: "2e730872c37f118a03864d23ebf7bab3"
+        hash: "7f503ceda23f0e4718f6216c3b4ddef7"
     }
     Frame {
         msec: 2544
-        hash: "381386302f210932bc7d44247a48f13c"
+        hash: "69f01285109c21cbd32a0f17942734be"
     }
     Frame {
         msec: 2560
-        hash: "306f8e6d183eb080da3375d65f2491f0"
+        hash: "f2060324802c080703ff62c051c7cff2"
     }
     Frame {
         msec: 2576
-        hash: "39862f236aabf362d0a07ba64eb212e1"
+        hash: "45d01b58f0812596aff06a09c1167d83"
     }
     Frame {
         msec: 2592
-        hash: "57452ecfea80ebd4d9fd23f8efbb34f2"
+        hash: "688c9931abdaa7225da91cdf7f2beb48"
     }
     Frame {
         msec: 2608
-        hash: "64bd12d4f6e32f19abef79289673c2fe"
+        hash: "d522505f28615cc17206ca6099dbd83e"
     }
     Frame {
         msec: 2624
-        hash: "56340d636f4df7e5f68e84c1d8388429"
+        hash: "ad86d8cee90c1458b64318f3edd94aee"
     }
     Frame {
         msec: 2640
-        hash: "795cd97d4be294fa6157f23793861ec3"
+        hash: "6dda1a6359b421ef7c9ffa4ecd863341"
     }
     Frame {
         msec: 2656
-        hash: "4be9fd5314ad6721a0ddf5a5dc51ccee"
+        hash: "dcc388cdf2b87e10b07e2f05ab6dce3c"
     }
     Frame {
         msec: 2672
-        hash: "3349b775c329db022bf0414b9ed57466"
+        hash: "a5d64264be7778929116c9407548c7f8"
     }
     Frame {
         msec: 2688
-        hash: "587b7070836063f9d138c4a4ee8da8bb"
+        hash: "cc7ac18a25936825d42694a9022b73fa"
     }
     Frame {
         msec: 2704
-        hash: "5bb078819bef7695c9af1bd4b544a26a"
+        hash: "4423af95764aadbaffe3c608fb3a376b"
     }
     Frame {
         msec: 2720
-        hash: "799c05999713e8b29f7d2917f515d2c2"
+        hash: "ad186cd5735531e2e6bfb2fc387dee2d"
     }
     Frame {
         msec: 2736
-        hash: "41bb926661acd8e21300f4933734748a"
+        hash: "d0e7c8071350bac03cf06996b6f74a63"
     }
     Frame {
         msec: 2752
-        hash: "2ead23d38a2f1834c7688a9657d9d7cc"
+        hash: "d012311c64fb35717155ebc88f9940d6"
     }
     Frame {
         msec: 2768
-        hash: "196309eac81adea21630dda19947ef5e"
+        hash: "13111334420c479b6a3ddbde65e2d143"
     }
     Frame {
         msec: 2784
-        hash: "cf414b2004712581f11f27890745c761"
+        hash: "3a77939f35498ef91590cd57c534fb6a"
     }
     Frame {
         msec: 2800
-        hash: "6b2a6837da878fa8f3811b2045e098b1"
+        hash: "89cbc568600c18c3d7163c3079a3f584"
     }
     Frame {
         msec: 2816
-        hash: "7390cfdef1d4bc194b86854b1947f15d"
+        hash: "2a8db5a4cae5258578749a88fbf915ce"
     }
     Frame {
         msec: 2832
-        hash: "9e4543fcf65a56edfbcaf46805343071"
+        hash: "ddd9cef18ce748096869dae9c2e23de3"
     }
     Frame {
         msec: 2848
-        hash: "3a886e2ed813eb7d44d0cd67eb5dee31"
+        hash: "d9e213af096ce69f75863ed7c39b59f4"
     }
     Frame {
         msec: 2864
-        hash: "625baed6cbf3a58b32060810be53d0b6"
+        hash: "69e9bfa09b8f5a1e2d83b77a5c9bc374"
     }
     Frame {
         msec: 2880
-        image: "particles.2.png"
+        hash: "ac6878edac61916bf424dcee2d7790e8"
     }
     Frame {
         msec: 2896
-        hash: "484666ad104cee644c6a7e8ec0c4b10e"
+        image: "particles.3.png"
     }
     Frame {
         msec: 2912
-        hash: "41abe2e2d92b293407141d0333d7d04a"
+        hash: "e60ed277794737b9f5d8c4a575f5b300"
     }
     Frame {
         msec: 2928
-        hash: "953c03834bd3b50798b77c0c6bb0f4a8"
+        hash: "5c1a39fa9789064ff0d5ea1fd4c6d187"
     }
     Frame {
         msec: 2944
-        hash: "a076463868003c62df3ee5147ffd4660"
+        hash: "64c1593bf33b85593153ac9eeeb7793e"
     }
     Frame {
         msec: 2960
-        hash: "b389b5c9ed31816dd562a8f1332d28c9"
+        hash: "dab7df26ba23ed3e750fa6080916f177"
     }
     Frame {
         msec: 2976
-        hash: "246706829939a2619d64fad63e424fdb"
+        hash: "5958428d5ab5a379f9bbcc0f86c20d1b"
     }
     Frame {
         msec: 2992
-        hash: "d5e644f16bde52c566191a054a1279e5"
+        hash: "65929536b7b8b48958fab7bd1e3ccca5"
     }
     Frame {
         msec: 3008
-        hash: "10b2e99d2e08939b75c24a6bbf481858"
+        hash: "cb157ba8c58bb7a8ec357e83e82ab441"
     }
     Frame {
         msec: 3024
-        hash: "732a7bb0009f394f0039e09594362c75"
+        hash: "bf36b7c52a3b3b2fb08524131bb4b9e2"
     }
     Frame {
         msec: 3040
-        hash: "261f38ce42a8a8c86daadd497ecfad07"
+        hash: "0d2dbb3ba42cad9e8b5833c97dd0cdba"
     }
     Frame {
         msec: 3056
-        hash: "8b66ae6261db386d6c4e88d0146db090"
+        hash: "f918a9f5fa6808b545c715dffa2f4838"
     }
     Frame {
         msec: 3072
-        hash: "dc8dba79e4466059c29725084cf801bb"
+        hash: "ec11344fb21ee06df6cface390d611d9"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeparticles/particles.qml b/tests/auto/declarative/qmlvisual/qdeclarativeparticles/particles.qml
index b36a220..38506a0 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativeparticles/particles.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeparticles/particles.qml
@@ -2,33 +2,34 @@ import QtQuick 1.0
 import Qt.labs.particles 1.0
 
 Rectangle {
+    property string skip: "May contain random numbers"
     width: 640; height: 480; color: "black"
 
-    Particles { id:particlesAnotEmitting
+    Particles { id:particlesAneverEmitting
         y:60; width: 260; height:30; source: "star.png";
         lifeSpan:1000; count: 50; angle:70; angleDeviation:36;
         velocity:30; velocityDeviation:10; emissionRate: 0
         ParticleMotionWander { yvariance:5; xvariance:30; pace:100 }
     }
-    Particles { id:particlesA
+    Particles { id:particlesA //snowy particles from the top
         y:0; width: 260; height:30; source: "star.png";
         lifeSpan:1000; count: 50; angle:70; angleDeviation:36;
         velocity:30; velocityDeviation:10; emissionRate: 10
         ParticleMotionWander { yvariance:5; xvariance:30; pace:100 }
     }
 
-    Particles { id:particlesB
+    Particles { id:particlesB //particle fountain bursting every second
         y:280; x:180; width:1; height:1; lifeSpan:1000; source: "star.png"
         count: 100; angle:270; angleDeviation:45; velocity:50; velocityDeviation:30;
         emissionRate: 0
         ParticleMotionGravity { yattractor: 1000; xattractor:0; acceleration:25 }
     }
 
-        Timer { running: true; interval: 1000; repeat: true; onTriggered: particlesB.burst(200, 2000); }
+    Timer { running: true; interval: 1000; repeat: true; onTriggered: particlesB.burst(200, 2000); }
 
     Column{
         x: 340;
-        Repeater{
+        Repeater{//emission variance test
             model: 5
             delegate: Component{
                 Item{