2 files changed, 27 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_context.qml b/tests/auto/quick/qquickcanvasitem/data/tst_context.qml
index b72e755ed9..ad44f6d28e 100644
--- a/tests/auto/quick/qquickcanvasitem/data/tst_context.qml
+++ b/tests/auto/quick/qquickcanvasitem/data/tst_context.qml
@@ -70,4 +70,20 @@ Canvas {
             compare(canvas.contextInPaint, canvas.getContext("2d"));
         }
    }
+
+    TestCase {
+        name: "ContextFontValidation"
+        when: canvas.available
+
+        function test_pixelSize() {
+            wait(100);
+            compare(contextSpy.count, 1);
+
+            var ctx = canvas.getContext("2d");
+            compare(ctx.font, "sans-serif,-1,10,5,50,0,0,0,0,0");
+
+            ctx.font = "80.1px sans-serif";
+            compare(ctx.font, "sans-serif,-1,80,5,50,0,0,0,0,0");
+        }
+    }
 }
diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_image.qml b/tests/auto/quick/qquickcanvasitem/data/tst_image.qml
index 72b6dcdb00..ca95f2aec1 100644
--- a/tests/auto/quick/qquickcanvasitem/data/tst_image.qml
+++ b/tests/auto/quick/qquickcanvasitem/data/tst_image.qml
@@ -216,6 +216,17 @@ CanvasTestCase {
 
    }
 
+   property url green: 'green.png'
+
+   function test_url(row) {
+       var canvas = createCanvasObject(row);
+       var ctx = canvas.getContext('2d');
+
+       canvas.loadImage(testCase.green);
+       ctx.drawImage(testCase.green, 0, 0);
+       comparePixel(ctx, 0,0, 0,255,0,255,2);
+   }
+
    function test_composite(row) {
        var canvas = createCanvasObject(row);
        var ctx = canvas.getContext('2d');