Don't crash when calculating the implicit width of truncated lines.

Remember to call beginLayout() on the QTextLayout before creating
lines or the layout data won't be allocated.

Change-Id: Ic344ca376fc25e38c50078135deb02dee3afc4f1
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>

1 files changed, 2 insertions, 1 deletions

diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp
index 70a1551205..f34c062c98 100644
--- a/src/quick/items/qquicktext.cpp
+++ b/src/quick/items/qquicktext.cpp
@@ -913,12 +913,13 @@ QRectF QQuickTextPrivate::setupTextLayout(qreal *const naturalWidth, qreal *cons
                 QTextLayout widthLayout(layoutText.mid(characterCount), scaledFont);
                 widthLayout.setTextOption(layout.textOption());
 
+                widthLayout.beginLayout();
                 for (; unwrappedLineCount <= maxLineCount; ++unwrappedLineCount) {
                     QTextLine line = widthLayout.createLine();
                     if (!line.isValid())
                         break;
                 }
-
+                widthLayout.endLayout();
                 *naturalWidth = qMax(*naturalWidth, widthLayout.maximumWidth());
             }