diff options
| author | Mitch Curtis <mitch.curtis@digia.com> | 2013-06-13 10:50:31 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-14 15:52:01 +0200 |
| commit | 4cb1981907eabc62069a3a8330c370223632013c (patch) | |
| tree | c2ac48559a303769cf36c4e3c53c6bd863a14a15 /src/quick/items/context2d/qquickcontext2d_p.h | |
| parent | f702dfa75ff8817e97f466d18b7c616c38f0d866 (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 'src/quick/items/context2d/qquickcontext2d_p.h')
| -rw-r--r-- | src/quick/items/context2d/qquickcontext2d_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quick/items/context2d/qquickcontext2d_p.h b/src/quick/items/context2d/qquickcontext2d_p.h index 24f5c44f18..6256249327 100644 --- a/src/quick/items/context2d/qquickcontext2d_p.h +++ b/src/quick/items/context2d/qquickcontext2d_p.h @@ -130,10 +130,11 @@ public: , shadowBlur(0) , shadowColor(qRgba(0, 0, 0, 0)) , globalCompositeOperation(QPainter::CompositionMode_SourceOver) - , font(QFont(QLatin1String("sans-serif"), 10)) + , font(QFont(QLatin1String("sans-serif"))) , textAlign(QQuickContext2D::Start) , textBaseline(QQuickContext2D::Alphabetic) { + font.setPixelSize(10); } QTransform matrix; |