diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-19 10:32:37 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-19 10:32:37 +0100 |
commit | 81b3d791b5920832eefb616720bccf5cd386cd57 (patch) | |
tree | 9c89f63c0977c5c7ae09d8a35b505dd09e88a64f /src/quick/items/qquicktext.cpp | |
parent | 7c9e51e7e7b358fb9c4829ee8f02918ec4cfd016 (diff) | |
parent | d1461c8429c7b6f9e9442f319d5a49b7e7a5b67d (diff) |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: Ieb48911638b5c1acdfd4dee8aa19dca9be99a1f6
Diffstat (limited to 'src/quick/items/qquicktext.cpp')
-rw-r--r-- | src/quick/items/qquicktext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp index 223219a3f9..5c436d2074 100644 --- a/src/quick/items/qquicktext.cpp +++ b/src/quick/items/qquicktext.cpp @@ -461,7 +461,7 @@ void QQuickTextPrivate::updateSize() } QQuickTextLine::QQuickTextLine() - : QObject(), m_line(0), m_height(0) + : QObject(), m_line(0), m_height(0), m_lineOffset(0) { } |