aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/qquickcanvasitem
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@digia.com>2013-06-13 10:50:31 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-06-14 15:52:01 +0200
commit4cb1981907eabc62069a3a8330c370223632013c (patch)
treec2ac48559a303769cf36c4e3c53c6bd863a14a15 /tests/auto/quick/qquickcanvasitem
parentf702dfa75ff8817e97f466d18b7c616c38f0d866 (diff)
Set default font size to 10px as per spec, not 10pt.
See: http://www.w3.org/TR/2dcontext/#dom-context-2d-font Also removes duplicated assignments that are done as part of the default constructor. Task-number: QTBUG-31716 Change-Id: I5bd131c14a5defd422d858f02974c215de7adae9 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Diffstat (limited to 'tests/auto/quick/qquickcanvasitem')
-rw-r--r--tests/auto/quick/qquickcanvasitem/data/tst_context.qml2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_context.qml b/tests/auto/quick/qquickcanvasitem/data/tst_context.qml
index 7350ed6c81..ad44f6d28e 100644
--- a/tests/auto/quick/qquickcanvasitem/data/tst_context.qml
+++ b/tests/auto/quick/qquickcanvasitem/data/tst_context.qml
@@ -80,6 +80,8 @@ Canvas {
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");
}