Merge remote branch 'qt/master' into file-engine-refactor

Conflicts:
	demos/declarative/minehunt/minehunt.pro
	src/corelib/io/io.pri
	src/corelib/io/qfsfileengine.cpp
	src/corelib/io/qfsfileengine_unix.cpp
	src/corelib/io/qfsfileengine_win.cpp
	src/s60installs/bwins/QtCoreu.def
	src/s60installs/bwins/QtDeclarativeu.def
	src/s60installs/bwins/QtGuiu.def
	src/s60installs/eabi/QtCoreu.def
	src/s60installs/eabi/QtDeclarativeu.def
	src/s60installs/eabi/QtGuiu.def
	tests/auto/qapplication/test/test.pro
	tests/auto/qaudioinput/qaudioinput.pro
	tests/auto/qaudiooutput/qaudiooutput.pro
	tests/auto/qchar/qchar.pro
	tests/auto/qdiriterator/qdiriterator.pro
	tests/auto/qsound/qsound.pro

1 files changed, 166 insertions, 0 deletions

diff --git a/tests/auto/lancelot/scripts/bitmaps.qps b/tests/auto/lancelot/scripts/bitmaps.qps
new file mode 100644
index 0000000..a816b9d
--- /dev/null
+++ b/tests/auto/lancelot/scripts/bitmaps.qps
@@ -0,0 +1,166 @@
+# Version: 1
+# CheckVsReference: 5%
+
+
+#setRenderHint SmoothPixmapTransform
+
+translate 10 50
+setBackground ff7f7f
+setPen 3f3f9f
+
+bitmap_load dome_mono.png the_pixmap
+
+save
+  # Draw with opaque pen/bg in transparent/opaque mode
+  setBackgroundMode Transparent
+  drawPixmap the_pixmap 0 0
+  setBackgroundMode Opaque
+  drawPixmap the_pixmap 110 0
+
+  translate 220 0
+
+  # Draw with alpha pen/bg in transparent/opaque mode
+  save
+	setBackground 7fff7f7f
+	setPen 7f3f3f9f
+    setBackgroundMode Transparent
+    drawPixmap the_pixmap 0 0
+    setBackgroundMode Opaque
+    drawPixmap the_pixmap 110 0
+  restore
+
+  translate 220 0
+
+  # Draw with rotated opaque pen/bg in transparent/opaque mode
+  setBackgroundMode Transparent
+  save
+    translate 50 50
+    rotate 10
+    translate -50 -50
+    drawPixmap the_pixmap 0 0
+  restore
+  setBackgroundMode Opaque
+  translate 110 0
+  save
+    translate 50 50
+    rotate 10
+    translate -50 -50
+    drawPixmap the_pixmap 0 0
+  restore
+restore
+
+translate 0 150
+
+save
+  setBackgroundMode Transparent
+  drawTiledPixmap the_pixmap 0 0 200 100
+  setBackgroundMode Opaque
+  drawTiledPixmap the_pixmap 210 0 200 100
+
+  translate 440 -10
+  save
+    rotate 10
+    drawTiledPixmap the_pixmap 0 0 200 100
+  restore
+restore
+
+translate 0 150
+save
+  setBackgroundMode Transparent
+  drawTiledPixmap the_pixmap 0 0 200 100 10 20
+  setBackgroundMode Opaque
+  drawTiledPixmap the_pixmap 210 0 200 100 10 20
+
+  translate 440 -10
+  save
+    rotate 10
+    drawTiledPixmap the_pixmap 0 0 200 100 10 20
+  restore
+restore
+
+
+pixmap_setMask the_pixmap mask_100.png
+drawPixmap the_pixmap 0 150
+setBackgroundMode Opaque
+drawPixmap the_pixmap 110 150
+
+translate 220 150
+save
+  translate 50 50
+  rotate 10
+  translate -50 -50
+  setBackgroundMode Transparent
+  drawPixmap the_pixmap 0 0
+restore
+
+translate 110 0
+save
+  translate 50 50
+  rotate 10
+  translate -50 -50
+  setBackgroundMode Opaque
+  drawPixmap the_pixmap 0 0
+restore
+
+resetMatrix
+translate 10 650
+bitmap_load dome_mono.png the_bitmap
+setBackgroundMode Transparent
+
+begin_block draw_subrected
+  drawPixmap the_bitmap  0  0 50 50  0  0 50 50
+  drawPixmap the_bitmap 50  0 50 50 50  0 50 50
+  drawPixmap the_bitmap  0 50 50 50  0 50 50 50
+  drawPixmap the_bitmap 50 50 50 50 50 50 50 50
+end_block
+
+translate 110 0
+setBackgroundMode Opaque
+repeat_block draw_subrected
+
+translate 110 0
+save
+  translate 20 -10
+  rotate 10
+  setBackgroundMode Transparent  
+  repeat_block draw_subrected
+restore
+
+translate 110 0
+save 
+  translate 20 -10
+  rotate 10
+  setBackgroundMode Opaque
+  repeat_block draw_subrected
+restore
+
+# Some helpful texts
+
+resetMatrix
+setPen black
+drawText 10 40 "Transparent"
+drawText 120 40 "Opaque"
+drawText 230 40 "Trans w/alpha"
+drawText 340 40 "Opaque w/alpha"
+drawText 450 40 "Trans w/xform"
+drawText 560 40 "Opaque w/xform"
+
+drawText 10 190 "Transparent tiled"
+drawText 220 190 "Opaque tiled"
+drawText 440 190 "Opaque w/xform"
+
+drawText 10 340 "Transparent tiled w/offset"
+drawText 220 340 "Opaque tiled w/offset"
+drawText 440 340 "Opaque w/xform w/offset"
+
+drawText 10 490 "Trans masked"
+drawText 120 490 "Opaque masked"
+drawText 230 490 "masked w/xform"
+drawText 340 490 "masked w/xform"
+
+drawText 10 640 "Subrected"
+drawText 110 640 "Subrected opaque"
+drawText 220 640 "subrect w/xform"
+drawText 330 640 "subrect w/xform opaque"
+
+