Merge remote-tracking branch 'origin/5.6' into 5.7

Change-Id: I35ca979395620e104e50b06366d0869433a4ffc2

4 files changed, 14 insertions, 14 deletions

diff --git a/tests/auto/other/lancelot/images/alpha2x2.png b/tests/auto/other/lancelot/images/alpha2x2.png
index 67ecc04286..8e99feb4cc 100644
--- a/tests/auto/other/lancelot/images/alpha2x2.png
+++ b/tests/auto/other/lancelot/images/alpha2x2.png
diff --git a/tests/auto/other/lancelot/images/solid2x2.png b/tests/auto/other/lancelot/images/solid2x2.png
index ad67cd3e12..f34562f964 100644
--- a/tests/auto/other/lancelot/images/solid2x2.png
+++ b/tests/auto/other/lancelot/images/solid2x2.png
diff --git a/tests/auto/other/lancelot/scripts/statictext.qps b/tests/auto/other/lancelot/scripts/statictext.qps
index c5ddda197f..6b7b97d8fa 100644
--- a/tests/auto/other/lancelot/scripts/statictext.qps
+++ b/tests/auto/other/lancelot/scripts/statictext.qps
@@ -9,7 +9,7 @@ save
   setFont "sansserif" 12 normal
   drawStaticText 0 40 "sansserif 12pt, normal"
 
-  setFont "sansserif" 10 bold
+  setFont "sansserif" 12 bold
   drawStaticText 0 60 "sansserif 12pt, bold"
 
   setFont "sansserif" 10 bold italic
@@ -25,7 +25,7 @@ save
   setFont "sansserif" 12 normal
   drawStaticText 0 40 "alpha sansserif 12pt, normal"
 
-  setFont "sansserif" 10 bold
+  setFont "sansserif" 12 bold
   drawStaticText 0 60 "alpha sansserif 12pt, bold"
 
   setFont "sansserif" 10 bold italic
@@ -43,7 +43,7 @@ save
     setFont "sansserif" 12 normal
     drawStaticText 0 40 "scaled sansserif 12pt, normal"
 
-    setFont "sansserif" 10 bold
+    setFont "sansserif" 12 bold
     drawStaticText 0 60 "scaled sansserif 12pt, bold"
 
     setFont "sansserif" 10 bold italic
@@ -61,7 +61,7 @@ save
     setFont "sansserif" 12 normal
     drawStaticText 0 40 "flipped sansserif 12pt, normal"
 
-    setFont "sansserif" 10 bold
+    setFont "sansserif" 12 bold
     drawStaticText 0 60 "flipped sansserif 12pt, bold"
 
     setFont "sansserif" 10 bold italic
@@ -75,16 +75,16 @@ save
     rotate 185
 
     setFont "sansserif" 10 normal
-    drawStaticText 0 20 "scaled sansserif 10pt, normal"
+    drawStaticText 0 20 "rotated sansserif 10pt, normal"
 
     setFont "sansserif" 12 normal
-    drawStaticText 0 40 "scaled sansserif 12pt, normal"
+    drawStaticText 0 40 "rotated sansserif 12pt, normal"
 
-    setFont "sansserif" 10 bold
-    drawStaticText 0 60 "scaled sansserif 12pt, bold"
+    setFont "sansserif" 12 bold
+    drawStaticText 0 60 "rotated sansserif 12pt, bold"
 
     setFont "sansserif" 10 bold italic
-    drawStaticText 0 80 "scaled sansserif 10pt, bold italic"
+    drawStaticText 0 80 "rotated sansserif 10pt, bold italic"
   restore
 
   translate 0 100
@@ -100,7 +100,7 @@ save
   setFont "sansserif" 12 normal
   drawStaticText 0 20 "gradient sansserif 12pt, normal"
 
-  setFont "sansserif" 10 bold
+  setFont "sansserif" 12 bold
   drawStaticText 0 40 "gradient sansserif 12pt, bold"
 
   setFont "sansserif" 10 bold italic
diff --git a/tests/auto/other/lancelot/scripts/text.qps b/tests/auto/other/lancelot/scripts/text.qps
index 169549a5bd..1b4fe4f064 100644
--- a/tests/auto/other/lancelot/scripts/text.qps
+++ b/tests/auto/other/lancelot/scripts/text.qps
@@ -77,16 +77,16 @@ save
     rotate 185
 
     setFont "sansserif" 10 normal
-    drawText 0 20 "scaled sansserif 10pt, normal"
+    drawText 0 20 "rotated sansserif 10pt, normal"
 
     setFont "sansserif" 12 normal
-    drawText 0 40 "scaled sansserif 12pt, normal"
+    drawText 0 40 "rotated sansserif 12pt, normal"
 
     setFont "sansserif" 12 bold
-    drawText 0 60 "scaled sansserif 12pt, bold"
+    drawText 0 60 "rotated sansserif 12pt, bold"
 
     setFont "sansserif" 10 bold italic
-    drawText 0 80 "scaled sansserif 10pt, bold italic"
+    drawText 0 80 "rotated sansserif 10pt, bold italic"
   restore
 
   translate 0 100