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

Conflicts:
	tests/auto/qtemporaryfile/qtemporaryfile.pro

2 files changed, 35 insertions, 0 deletions

diff --git a/tests/arthur/data/qps/borderimage.qps b/tests/arthur/data/qps/borderimage.qps
index 747a74d..8d2e54b 100644
--- a/tests/arthur/data/qps/borderimage.qps
+++ b/tests/arthur/data/qps/borderimage.qps
@@ -106,6 +106,38 @@ repeat_block draw_column
 resetMatrix
 setRenderHint Antialiasing off
 
+translate 200.1 520.1
+
+begin_block one_pixel_border
+drawImage borderimage   0   0  16  16   0   0  16  16
+drawImage borderimage  16   0  64  16  16   0   1   1
+drawImage borderimage  80   0  16  16  48   0  16  16
+
+drawImage borderimage   0  16  16  64  16   0   1   1
+drawImage borderimage  80  16  16  64  16   0   1   1
+
+drawImage borderimage   0  80  16  16   0  48  16  16
+drawImage borderimage  16  80  64  16  16   0   1   1
+drawImage borderimage  80  80  16  16  48  48  16  16
+end_block one_pixel_border
+
+resetMatrix
+
+translate 205.1 626.1
+scale 0.4 0.4
+
+repeat_block one_pixel_border
+
+resetMatrix
+
+translate 255.1 624.1
+scale 0.4 0.4
+rotate 10
+
+repeat_block one_pixel_border
+
+resetMatrix
+
 setPen red
 
 drawRect 0 0 70 680
@@ -127,3 +159,6 @@ drawText 174 114 "smoothpixmaptransform off"
 
 drawRect 164 128 224 134
 drawText 174 252 "smoothpixmaptransform on"
+
+drawRect 200 520 97 188
+drawText 210 698 "1x1 edges"
diff --git a/tests/arthur/data/qps/borderimage_qps.png b/tests/arthur/data/qps/borderimage_qps.png
index 89a8eba..ed51d5f 100644
--- a/tests/arthur/data/qps/borderimage_qps.png
+++ b/tests/arthur/data/qps/borderimage_qps.png