Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt

13 files changed, 85 insertions, 84 deletions

diff --git a/tests/arthur/data/1.2/textArea01.svg b/tests/arthur/data/1.2/textArea01.svg
index 79fcd0a..945c34c 100644
--- a/tests/arthur/data/1.2/textArea01.svg
+++ b/tests/arthur/data/1.2/textArea01.svg
@@ -6,5 +6,5 @@
         height="300">Tomorrow, and tomorrow, and
         tomorrow; creeps in this petty pace from day to day, until the last syll­able of recorded
         time. And all our yesterdays have lighted fools the way to dusty death.</textArea>
-    <rect x="5" y="5" width="210" height="310" stroke-width="3" stroke="#777"/>
+    <rect x="5" y="5" width="210" height="310" stroke-width="3" stroke="#777" fill="none"/>
 </svg>
diff --git a/tests/arthur/data/qps/linear_gradients_perspectives_qps.png b/tests/arthur/data/qps/linear_gradients_perspectives_qps.png
index 42ba872..3315ebe 100644
--- a/tests/arthur/data/qps/linear_gradients_perspectives_qps.png
+++ b/tests/arthur/data/qps/linear_gradients_perspectives_qps.png
diff --git a/tests/arthur/data/qps/linear_gradients_qps.png b/tests/arthur/data/qps/linear_gradients_qps.png
index dc5223b..a4cdc43 100644
--- a/tests/arthur/data/qps/linear_gradients_qps.png
+++ b/tests/arthur/data/qps/linear_gradients_qps.png
diff --git a/tests/arthur/data/qps/lineconsistency_qps.png b/tests/arthur/data/qps/lineconsistency_qps.png
index 48768ef..9d19a5d 100644
--- a/tests/arthur/data/qps/lineconsistency_qps.png
+++ b/tests/arthur/data/qps/lineconsistency_qps.png
diff --git a/tests/arthur/data/qps/linedashes2_aa_qps.png b/tests/arthur/data/qps/linedashes2_aa_qps.png
index 0cb5b40..54c84b3 100644
--- a/tests/arthur/data/qps/linedashes2_aa_qps.png
+++ b/tests/arthur/data/qps/linedashes2_aa_qps.png
diff --git a/tests/arthur/data/qps/paths_aa_qps.png b/tests/arthur/data/qps/paths_aa_qps.png
index 45b4b74..e51a4ac 100644
--- a/tests/arthur/data/qps/paths_aa_qps.png
+++ b/tests/arthur/data/qps/paths_aa_qps.png
diff --git a/tests/arthur/data/qps/paths_qps.png b/tests/arthur/data/qps/paths_qps.png
index a9a8743..094a84f 100644
--- a/tests/arthur/data/qps/paths_qps.png
+++ b/tests/arthur/data/qps/paths_qps.png
diff --git a/tests/arthur/data/qps/radial_gradients_perspectives_qps.png b/tests/arthur/data/qps/radial_gradients_perspectives_qps.png
index 0e28aae..d833250 100644
--- a/tests/arthur/data/qps/radial_gradients_perspectives_qps.png
+++ b/tests/arthur/data/qps/radial_gradients_perspectives_qps.png
diff --git a/tests/arthur/data/qps/radial_gradients_qps.png b/tests/arthur/data/qps/radial_gradients_qps.png
index 66fcfc4..11043e8 100644
--- a/tests/arthur/data/qps/radial_gradients_qps.png
+++ b/tests/arthur/data/qps/radial_gradients_qps.png
diff --git a/tests/arthur/data/qps/rasterops.qps b/tests/arthur/data/qps/rasterops.qps
index b79ec0d..ee3deca 100644
--- a/tests/arthur/data/qps/rasterops.qps
+++ b/tests/arthur/data/qps/rasterops.qps
@@ -1,83 +1,84 @@
-setPen NoPen
-
-setBrush black
-drawRect 10 10 1200 140
-
-setCompositionMode SourceOrDestination
-translate 20 20
-begin_block drawShape
-setBrush 0xffff0000
-drawEllipse 10 10 80 80
-setBrush 0xff00ff00
-drawRect 0 0 50 50
-setBrush 0xff0000ff
-drawRect 50 50 50 50
-end_block
-
-begin_block loop
-setCompositionMode SourceAndDestination
-translate 120 0
-repeat_block drawShape
-
-setCompositionMode SourceXorDestination
-translate 120 0
-repeat_block drawShape
-
-setCompositionMode NotSourceAndNotDestination
-translate 120 0
-repeat_block drawShape
-
-setCompositionMode NotSourceOrNotDestination
-translate 120 0
-repeat_block drawShape
-
-setCompositionMode NotSourceXorDestination
-translate 120 0
-repeat_block drawShape
-
-setCompositionMode NotSource
-translate 120 0
-repeat_block drawShape
-
-setCompositionMode NotSourceAndDestination
-translate 120 0
-repeat_block drawShape
-
-setCompositionMode SourceAndNotDestination
-translate 120 0
-repeat_block drawShape
-end_block
-
-resetMatrix
-setCompositionMode Source
-setBrush white
-drawRect 10 160 1200 140
-translate 20 170
-repeat_block loop
-
-resetMatrix
-setCompositionMode Source
-translate 20 320
-repeat_block loop
-
-resetMatrix
-setPen black
-setCompositionMode SourceOver
-translate 20 470
-drawText 20 0 "Or ROP"
-translate 120 0
-drawText 20 0 "And ROP"
-translate 120 0
-drawText 20 0 "Xor ROP"
-translate 120 0
-drawText 20 0 "Nor ROP"
-translate 120 0
-drawText 20 0 "Nand ROP"
-translate 120 0
-drawText 0 0 "NSrcXorDst ROP"
-translate 120 0
-drawText 20 0 "NSrc ROP"
-translate 120 0
-drawText 0 0 "NSrcAndDst ROP"
-translate 120 0
-drawText 0 0 "SrcAndNDst ROP"
+setPen NoPen

+

+setBrush black

+drawRect 10 10 60 500

+

+setCompositionMode SourceOrDestination

+translate 20 20

+

+begin_block drawShape

+  setBrush 0xffff0000

+  drawEllipse 5 5 30 30

+  setBrush 0xff00ff00

+  drawRect 0 0 20 20 

+  setBrush 0xff0000ff

+  drawRect 20 20 20 20 

+end_block

+

+begin_block loop

+  setCompositionMode SourceAndDestination

+  translate 0 50

+repeat_block drawShape

+

+setCompositionMode SourceXorDestination

+translate 0 50

+repeat_block drawShape

+

+setCompositionMode NotSourceAndNotDestination

+translate 0 50

+repeat_block drawShape

+

+setCompositionMode NotSourceOrNotDestination

+translate 0 50

+repeat_block drawShape

+

+setCompositionMode NotSourceXorDestination

+translate 0 50

+repeat_block drawShape

+

+setCompositionMode NotSource

+translate 0 50

+repeat_block drawShape

+

+setCompositionMode NotSourceAndDestination

+translate 0 50

+repeat_block drawShape

+

+setCompositionMode SourceAndNotDestination

+translate 0 50

+repeat_block drawShape

+end_block

+

+resetMatrix

+setCompositionMode Source

+setBrush white

+drawRect 100 10 60 500

+translate 110 20

+repeat_block loop

+

+resetMatrix

+setCompositionMode Source

+translate 190 20

+repeat_block loop

+

+resetMatrix

+setPen black

+setCompositionMode SourceOver

+translate 250 45

+drawText 20 0 "Or ROP"

+translate 0 50

+drawText 20 0 "And ROP"

+translate 0 50

+drawText 20 0 "Xor ROP"

+translate 0 50

+drawText 20 0 "Nor ROP"

+translate 0 50

+drawText 20 0 "Nand ROP"

+translate 0 50

+drawText 0 0 "NSrcXorDst ROP"

+translate 0 50

+drawText 20 0 "NSrc ROP"

+translate 0 50

+drawText 0 0 "NSrcAndDst ROP"

+translate 0 50

+drawText 0 0 "SrcAndNDst ROP"

diff --git a/tests/arthur/data/qps/rasterops_qps.png b/tests/arthur/data/qps/rasterops_qps.png
index 80ca8ae..7b93001 100644
--- a/tests/arthur/data/qps/rasterops_qps.png
+++ b/tests/arthur/data/qps/rasterops_qps.png
diff --git a/tests/arthur/data/qps/text_perspectives_qps.png b/tests/arthur/data/qps/text_perspectives_qps.png
index 483ccc0..183ad6f 100644
--- a/tests/arthur/data/qps/text_perspectives_qps.png
+++ b/tests/arthur/data/qps/text_perspectives_qps.png
diff --git a/tests/arthur/data/qps/text_qps.png b/tests/arthur/data/qps/text_qps.png
index 2c2ebf2..9a95493 100644
--- a/tests/arthur/data/qps/text_qps.png
+++ b/tests/arthur/data/qps/text_qps.png