diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-20 12:26:08 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-20 12:26:08 +0200 |
| commit | cb6c208c77e2e3c8b6d5957fae73f0326eee4296 (patch) | |
| tree | cd4a956eb3208358c28adbacf11c3694091ce549 /src/quick/util/qquickstyledtext_p.h | |
| parent | 34956bc234bf1b2ebcf224a256297293ba4276aa (diff) | |
| parent | 3cd46501b2a663c7cb20cae21b4ed051f2ce4ac7 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/qml/jit/qv4targetplatform_p.h
src/quick/accessible/qaccessiblequickitem_p.h
Change-Id: Ic95075a5fad81ec997a61561bd65979dfa3b9d4d
Diffstat (limited to 'src/quick/util/qquickstyledtext_p.h')
| -rw-r--r-- | src/quick/util/qquickstyledtext_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quick/util/qquickstyledtext_p.h b/src/quick/util/qquickstyledtext_p.h index ee3f42cb48..2a2e234224 100644 --- a/src/quick/util/qquickstyledtext_p.h +++ b/src/quick/util/qquickstyledtext_p.h @@ -68,7 +68,7 @@ class Q_AUTOTEST_EXPORT QQuickStyledTextImgTag { public: QQuickStyledTextImgTag() - : position(0), align(QQuickStyledTextImgTag::Bottom), pix(0) + : position(0), offset(0.0), align(QQuickStyledTextImgTag::Bottom), pix(0) { } ~QQuickStyledTextImgTag() { delete pix; } @@ -83,6 +83,7 @@ public: QPointF pos; QSize size; int position; + qreal offset; // this offset allows us to compensate for flooring reserved space Align align; QQuickPixmap *pix; }; |