diff options
author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-01-21 08:08:30 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-01-21 08:08:30 +0000 |
commit | 872a05475721ad771bd347d1526035e6e7479d30 (patch) | |
tree | 5edd3e40174ef1379057ff9b1d2107e67e09bda1 /src/quick/items/qquicktext.cpp | |
parent | d68a7e04f2a0c01e087190a6171e7c37ffb0359d (diff) | |
parent | 81b3d791b5920832eefb616720bccf5cd386cd57 (diff) |
Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6
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) { } |