Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7

1 files changed, 78 insertions, 302 deletions

diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.qml b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.qml
index 1200099..6c7a940 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.qml
@@ -6,538 +6,314 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
+        image: "animated-smooth.0.png"
     }
     Frame {
         msec: 32
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
+        hash: "a2467396d7318a93d35aa314896d3d05"
     }
     Frame {
         msec: 48
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
+        hash: "a2467396d7318a93d35aa314896d3d05"
     }
     Frame {
         msec: 64
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
+        hash: "8ba2cebd7b80bd58612ce46470e7763b"
     }
     Frame {
         msec: 80
-        hash: "9419c891e347fe6b25d30c05bae5d14c"
+        hash: "9ab9c8f788bbca58552bbb6009386d69"
     }
     Frame {
         msec: 96
-        hash: "62430dd693c4eaeb7afe9e85229406a4"
+        hash: "7f4b50df7848ad07fb75cb19f2c4b04a"
     }
     Frame {
         msec: 112
-        hash: "a9b6aeb509076bf17c2068ce280326fb"
+        hash: "425e48ae492190eb6b8028be11352d7e"
     }
     Frame {
         msec: 128
-        hash: "2570806925c3a61a7afaa09331c6eed8"
+        hash: "183e1f8321edb7b8d1cc2cc858039360"
     }
     Frame {
         msec: 144
-        hash: "98d48920293b11511e8bbf820dd49acc"
+        hash: "83d82bc27b0e3387dddb8e7e09380e02"
     }
     Frame {
         msec: 160
-        hash: "e4809aefa55620a86484f66582d4d1b6"
+        hash: "bca94a64a283e7e30ec8c1fe3249f981"
     }
     Frame {
         msec: 176
-        hash: "098b063b0e5eb3dd22adb3353342725e"
+        hash: "26cbcf6233c8fd222a857a8ae801749a"
     }
     Frame {
         msec: 192
-        hash: "30aadc837ec2e7d8a2495453348804bc"
+        hash: "ac1d21dba648ab729e1670ead441b173"
     }
     Frame {
         msec: 208
-        hash: "05013a538f2796c728b4d0ddad059851"
+        hash: "e42811f8029c6cd70041f8492a31ff27"
     }
     Frame {
         msec: 224
-        hash: "b221f14ea2c04078e23ac37ef817c50e"
+        hash: "f0b06b2ccf1be47ab7c5f6863ccdc495"
     }
     Frame {
         msec: 240
-        hash: "3ef9de605fff5d3156bccc99a93c5da6"
+        hash: "9b398166d385facb2d02c86cd92ab85f"
     }
     Frame {
         msec: 256
-        hash: "7722a4c025f1d2b560c7fec8ba8f7b6d"
+        hash: "a4414a5ae4e44320383d49441d7acb51"
     }
     Frame {
         msec: 272
-        hash: "e24ad2d67f10d2cc58dffcc469342005"
+        hash: "f09208fa210f3b0b271af9ef6f3741e8"
     }
     Frame {
         msec: 288
-        hash: "5153a42348885ce8de81f8086f73c163"
+        hash: "054f7aebcef583f9c8469aaa2e62f9ea"
     }
     Frame {
         msec: 304
-        hash: "7083d70df6cc476ec342abbe6f4409b4"
+        hash: "1331b1218fa6134922ab248bfde5d3f6"
     }
     Frame {
         msec: 320
-        hash: "befd4cd74f59291a9f9a01ad2a051029"
+        hash: "601b97220c77c185d9ed3ae3726815a5"
     }
     Frame {
         msec: 336
-        hash: "705cd5a0717b6a8de8871bf0bfb38129"
+        hash: "487c739f3849834e3d7fa2885bb28375"
     }
     Frame {
         msec: 352
-        hash: "a65d51747c0183a3a096e51326fdae78"
+        hash: "c41dc19ab7f3c80349ac52ab2c3b410d"
     }
     Frame {
         msec: 368
-        hash: "99ec9ca33a26afd9e34c1d3246502926"
+        hash: "c6e8b055e5919aecbf2ef4d88de6cabd"
     }
     Frame {
         msec: 384
-        hash: "3355ce4b409474e6dbd99d010471a0a4"
+        hash: "f9d99999cccd8a3a9d7cb74cadb08059"
     }
     Frame {
         msec: 400
-        hash: "bcfb117c5860306c016a05e828773777"
+        hash: "c466c57cda1c7666a46bab9478031c86"
     }
     Frame {
         msec: 416
-        hash: "4650216f60377bf7798877546c723d0a"
+        hash: "02f9c85d8cbd9041ed18d2fe0071c526"
     }
     Frame {
         msec: 432
-        hash: "3821707e1201c5eebb043f86887c6bc4"
+        hash: "355d2b1b30a721a26f80c414bd9164f6"
     }
     Frame {
         msec: 448
-        hash: "19c079bd61467706ff54f039f512dee6"
+        hash: "bfc8b1bdb53f4a4c44285a5c10819ae7"
     }
     Frame {
         msec: 464
-        hash: "9fdd3bb7d735a96df8538f2883d784fe"
+        hash: "c272ac121fe5392f12ef3180d4c694c8"
     }
     Frame {
         msec: 480
-        hash: "d8096b88c24221d7176472031de3dc14"
+        hash: "83324ab9209ac5246c39274ecec2dbcf"
     }
     Frame {
         msec: 496
-        hash: "be4abb3dd1ee3fc62b83d152a1a89576"
+        hash: "b128fd583f5fa460bcd1c062226274fb"
     }
     Frame {
         msec: 512
-        hash: "e3d2caf6eb0afd2e6efd5c08a580e158"
+        hash: "f46f1f1069806b1e17f340140e82bfd3"
     }
     Frame {
         msec: 528
-        hash: "40bdf75ac82c26a741939945dbf85924"
+        hash: "dff621d5da5f4d008a8f874914f90637"
     }
     Frame {
         msec: 544
-        hash: "e2e3bee6bf84bc82c50a68e442440f05"
+        hash: "c5920a84e215f4bbda3032bbfbca4070"
     }
     Frame {
         msec: 560
-        hash: "2cb89b7538d4dd398a9ff5a94e2d0020"
+        hash: "ecc23f198a4bf346bf6eee51f7adea69"
     }
     Frame {
         msec: 576
-        hash: "41dce41d337e7d24a5e70d831dbb448b"
+        hash: "dcc8f5b1b6aac31c3c5856560b37c501"
     }
     Frame {
         msec: 592
-        hash: "7812862b4c1d67a64792a94cb584a9ed"
+        hash: "203fa4bd23440aa88fc2a27b66ee091d"
     }
     Frame {
         msec: 608
-        hash: "a82a2af4b9cee89e03db363f979d1661"
+        hash: "a2662209c8f9aa7bd9c5b4066b289cde"
     }
     Frame {
         msec: 624
-        hash: "7071a72a55fab2d7b367eb113d38dc6d"
+        hash: "a2662209c8f9aa7bd9c5b4066b289cde"
     }
     Frame {
         msec: 640
-        hash: "835de3a883cb3a7c35cb533f51f9b32c"
+        hash: "203fa4bd23440aa88fc2a27b66ee091d"
     }
     Frame {
         msec: 656
-        hash: "498afb76e236561638532ba6cafd758a"
+        hash: "dcc8f5b1b6aac31c3c5856560b37c501"
     }
     Frame {
         msec: 672
-        hash: "38ebf5835263e6e80e75653971ad74b4"
+        hash: "ecc23f198a4bf346bf6eee51f7adea69"
     }
     Frame {
         msec: 688
-        hash: "b5e8c06b458b1afac627ed7f7e76c868"
+        hash: "c5920a84e215f4bbda3032bbfbca4070"
     }
     Frame {
         msec: 704
-        hash: "594e33c35006281b2df3a45c13c31c44"
+        hash: "dff621d5da5f4d008a8f874914f90637"
     }
     Frame {
         msec: 720
-        hash: "a49989ca004a6991b49d1978cfc0fed7"
+        hash: "f46f1f1069806b1e17f340140e82bfd3"
     }
     Frame {
         msec: 736
-        hash: "a743fc5cdcaadd42095e9e0d8441f7cc"
+        hash: "b128fd583f5fa460bcd1c062226274fb"
     }
     Frame {
         msec: 752
-        hash: "4ca1600674bad4b753007322945e25dd"
+        hash: "83324ab9209ac5246c39274ecec2dbcf"
     }
     Frame {
         msec: 768
-        hash: "d2921c6ae6a1aa9168a2fa93e8936ff2"
+        hash: "c272ac121fe5392f12ef3180d4c694c8"
     }
     Frame {
         msec: 784
-        hash: "55b9f82693d6ebde9ec23e3ed554bb9c"
+        hash: "bfc8b1bdb53f4a4c44285a5c10819ae7"
     }
     Frame {
         msec: 800
-        hash: "15e72f5cd1847f591b0c4f6ecb74ed4a"
+        hash: "355d2b1b30a721a26f80c414bd9164f6"
     }
     Frame {
         msec: 816
-        hash: "7aa94688f72d6ddade09a9d99f1c5563"
+        hash: "02f9c85d8cbd9041ed18d2fe0071c526"
     }
     Frame {
         msec: 832
-        hash: "b782f52c9cb50c72307bbd8fd15fffd2"
+        hash: "c466c57cda1c7666a46bab9478031c86"
     }
     Frame {
         msec: 848
-        hash: "8106f20a3c0c3e7ea0e502e963993330"
+        hash: "f9d99999cccd8a3a9d7cb74cadb08059"
     }
     Frame {
         msec: 864
-        hash: "670b05d25b72ed4c6affdcf873374947"
+        hash: "c6e8b055e5919aecbf2ef4d88de6cabd"
     }
     Frame {
         msec: 880
-        hash: "a34b08cb7e724c0563f86a5c8e209868"
+        hash: "c41dc19ab7f3c80349ac52ab2c3b410d"
     }
     Frame {
         msec: 896
-        hash: "f5281eba399a13f6fa024ae0fa6b01bd"
+        hash: "487c739f3849834e3d7fa2885bb28375"
     }
     Frame {
         msec: 912
-        hash: "db4dba10574839c3b3d8684aa1a2ad08"
+        hash: "601b97220c77c185d9ed3ae3726815a5"
     }
     Frame {
         msec: 928
-        hash: "b90f1f30d340d292c658145f62e2bb8a"
+        hash: "1331b1218fa6134922ab248bfde5d3f6"
     }
     Frame {
         msec: 944
-        hash: "452c45b5cc9be80abde7af04ba49731c"
+        hash: "054f7aebcef583f9c8469aaa2e62f9ea"
     }
     Frame {
         msec: 960
-        image: "animated-smooth.0.png"
+        hash: "f09208fa210f3b0b271af9ef6f3741e8"
     }
     Frame {
         msec: 976
-        hash: "8af61e4b09309e31394ae635d58fafd2"
+        image: "animated-smooth.1.png"
     }
     Frame {
         msec: 992
-        hash: "9ce60e38b7025c6fa72432de6a3c88b2"
+        hash: "9b398166d385facb2d02c86cd92ab85f"
     }
     Frame {
         msec: 1008
-        hash: "9e7f9d0e83a33f005d9ee579140c5562"
+        hash: "f0b06b2ccf1be47ab7c5f6863ccdc495"
     }
     Frame {
         msec: 1024
-        hash: "9e7f9d0e83a33f005d9ee579140c5562"
+        hash: "e42811f8029c6cd70041f8492a31ff27"
     }
     Frame {
         msec: 1040
-        hash: "9ce60e38b7025c6fa72432de6a3c88b2"
+        hash: "ac1d21dba648ab729e1670ead441b173"
     }
     Frame {
         msec: 1056
-        hash: "8af61e4b09309e31394ae635d58fafd2"
+        hash: "26cbcf6233c8fd222a857a8ae801749a"
     }
     Frame {
         msec: 1072
-        hash: "d9ab04d0a6a9373e5622e1124db17866"
+        hash: "bca94a64a283e7e30ec8c1fe3249f981"
     }
     Frame {
         msec: 1088
-        hash: "452c45b5cc9be80abde7af04ba49731c"
+        hash: "83d82bc27b0e3387dddb8e7e09380e02"
     }
     Frame {
         msec: 1104
-        hash: "b90f1f30d340d292c658145f62e2bb8a"
+        hash: "183e1f8321edb7b8d1cc2cc858039360"
     }
     Frame {
         msec: 1120
-        hash: "db4dba10574839c3b3d8684aa1a2ad08"
+        hash: "425e48ae492190eb6b8028be11352d7e"
     }
     Frame {
         msec: 1136
-        hash: "f5281eba399a13f6fa024ae0fa6b01bd"
+        hash: "7f4b50df7848ad07fb75cb19f2c4b04a"
     }
     Frame {
         msec: 1152
-        hash: "a34b08cb7e724c0563f86a5c8e209868"
+        hash: "9ab9c8f788bbca58552bbb6009386d69"
     }
     Frame {
         msec: 1168
-        hash: "670b05d25b72ed4c6affdcf873374947"
+        hash: "8ba2cebd7b80bd58612ce46470e7763b"
     }
     Frame {
         msec: 1184
-        hash: "8106f20a3c0c3e7ea0e502e963993330"
+        hash: "a2467396d7318a93d35aa314896d3d05"
     }
     Frame {
         msec: 1200
-        hash: "b782f52c9cb50c72307bbd8fd15fffd2"
+        hash: "a2467396d7318a93d35aa314896d3d05"
     }
     Frame {
         msec: 1216
-        hash: "7aa94688f72d6ddade09a9d99f1c5563"
+        hash: "a2467396d7318a93d35aa314896d3d05"
     }
     Frame {
         msec: 1232
-        hash: "15e72f5cd1847f591b0c4f6ecb74ed4a"
+        hash: "a2467396d7318a93d35aa314896d3d05"
     }
     Frame {
         msec: 1248
-        hash: "55b9f82693d6ebde9ec23e3ed554bb9c"
-    }
-    Frame {
-        msec: 1264
-        hash: "d2921c6ae6a1aa9168a2fa93e8936ff2"
-    }
-    Frame {
-        msec: 1280
-        hash: "4ca1600674bad4b753007322945e25dd"
-    }
-    Frame {
-        msec: 1296
-        hash: "a743fc5cdcaadd42095e9e0d8441f7cc"
-    }
-    Frame {
-        msec: 1312
-        hash: "a49989ca004a6991b49d1978cfc0fed7"
-    }
-    Frame {
-        msec: 1328
-        hash: "594e33c35006281b2df3a45c13c31c44"
-    }
-    Frame {
-        msec: 1344
-        hash: "b5e8c06b458b1afac627ed7f7e76c868"
-    }
-    Frame {
-        msec: 1360
-        hash: "38ebf5835263e6e80e75653971ad74b4"
-    }
-    Frame {
-        msec: 1376
-        hash: "498afb76e236561638532ba6cafd758a"
-    }
-    Frame {
-        msec: 1392
-        hash: "835de3a883cb3a7c35cb533f51f9b32c"
-    }
-    Frame {
-        msec: 1408
-        hash: "7071a72a55fab2d7b367eb113d38dc6d"
-    }
-    Frame {
-        msec: 1424
-        hash: "a82a2af4b9cee89e03db363f979d1661"
-    }
-    Frame {
-        msec: 1440
-        hash: "7812862b4c1d67a64792a94cb584a9ed"
-    }
-    Frame {
-        msec: 1456
-        hash: "41dce41d337e7d24a5e70d831dbb448b"
-    }
-    Frame {
-        msec: 1472
-        hash: "2cb89b7538d4dd398a9ff5a94e2d0020"
-    }
-    Frame {
-        msec: 1488
-        hash: "e2e3bee6bf84bc82c50a68e442440f05"
-    }
-    Frame {
-        msec: 1504
-        hash: "40bdf75ac82c26a741939945dbf85924"
-    }
-    Frame {
-        msec: 1520
-        hash: "e3d2caf6eb0afd2e6efd5c08a580e158"
-    }
-    Frame {
-        msec: 1536
-        hash: "be4abb3dd1ee3fc62b83d152a1a89576"
-    }
-    Frame {
-        msec: 1552
-        hash: "d8096b88c24221d7176472031de3dc14"
-    }
-    Frame {
-        msec: 1568
-        hash: "9fdd3bb7d735a96df8538f2883d784fe"
-    }
-    Frame {
-        msec: 1584
-        hash: "19c079bd61467706ff54f039f512dee6"
-    }
-    Frame {
-        msec: 1600
-        hash: "3821707e1201c5eebb043f86887c6bc4"
-    }
-    Frame {
-        msec: 1616
-        hash: "4650216f60377bf7798877546c723d0a"
-    }
-    Frame {
-        msec: 1632
-        hash: "bcfb117c5860306c016a05e828773777"
-    }
-    Frame {
-        msec: 1648
-        hash: "3355ce4b409474e6dbd99d010471a0a4"
-    }
-    Frame {
-        msec: 1664
-        hash: "99ec9ca33a26afd9e34c1d3246502926"
-    }
-    Frame {
-        msec: 1680
-        hash: "a65d51747c0183a3a096e51326fdae78"
-    }
-    Frame {
-        msec: 1696
-        hash: "705cd5a0717b6a8de8871bf0bfb38129"
-    }
-    Frame {
-        msec: 1712
-        hash: "befd4cd74f59291a9f9a01ad2a051029"
-    }
-    Frame {
-        msec: 1728
-        hash: "7083d70df6cc476ec342abbe6f4409b4"
-    }
-    Frame {
-        msec: 1744
-        hash: "5153a42348885ce8de81f8086f73c163"
-    }
-    Frame {
-        msec: 1760
-        hash: "e24ad2d67f10d2cc58dffcc469342005"
-    }
-    Frame {
-        msec: 1776
-        hash: "7722a4c025f1d2b560c7fec8ba8f7b6d"
-    }
-    Frame {
-        msec: 1792
-        hash: "3ef9de605fff5d3156bccc99a93c5da6"
-    }
-    Frame {
-        msec: 1808
-        hash: "b221f14ea2c04078e23ac37ef817c50e"
-    }
-    Frame {
-        msec: 1824
-        hash: "05013a538f2796c728b4d0ddad059851"
-    }
-    Frame {
-        msec: 1840
-        hash: "30aadc837ec2e7d8a2495453348804bc"
-    }
-    Frame {
-        msec: 1856
-        hash: "098b063b0e5eb3dd22adb3353342725e"
-    }
-    Frame {
-        msec: 1872
-        hash: "e4809aefa55620a86484f66582d4d1b6"
-    }
-    Frame {
-        msec: 1888
-        hash: "98d48920293b11511e8bbf820dd49acc"
-    }
-    Frame {
-        msec: 1904
-        hash: "2570806925c3a61a7afaa09331c6eed8"
-    }
-    Frame {
-        msec: 1920
-        image: "animated-smooth.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "62430dd693c4eaeb7afe9e85229406a4"
-    }
-    Frame {
-        msec: 1952
-        hash: "9419c891e347fe6b25d30c05bae5d14c"
-    }
-    Frame {
-        msec: 1968
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 1984
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 2000
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 2016
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 2032
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 2048
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 2064
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 2080
-        hash: "9419c891e347fe6b25d30c05bae5d14c"
-    }
-    Frame {
-        msec: 2096
-        hash: "62430dd693c4eaeb7afe9e85229406a4"
-    }
-    Frame {
-        msec: 2112
-        hash: "a9b6aeb509076bf17c2068ce280326fb"
-    }
-    Frame {
-        msec: 2128
-        hash: "2570806925c3a61a7afaa09331c6eed8"
-    }
-    Frame {
-        msec: 2144
-        hash: "98d48920293b11511e8bbf820dd49acc"
+        hash: "a2467396d7318a93d35aa314896d3d05"
     }
 }