diff options
| author | Siyeon Seo <siyeon.seo@lge.com> | 2021-03-10 17:14:08 +0900 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2021-04-17 18:14:44 +0300 |
| commit | e5d149d9839516c371aea6da36fda98663e137f0 (patch) | |
| tree | 046021dd965d4a9f946b3a606a324667fa110663 | |
| parent | fdebe9afad9341b5804e118fb2f7f24ad78f2b3d (diff) | |
Avoid crash when accessing an empty QTextLine
In any case an empty QTextLine should not be used. Q_ASSERT doesn't help
in non-debug build.
Pick-to: 6.1
Change-Id: I10b7895bc9b4cfd061aea086f810a9f8bf6d301a
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
(cherry picked from commit 447831e6e0fcc37e8617430827702b59856d5edb)
| -rw-r--r-- | src/quick/items/qquicktext.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp index 8a6b73fbd5..b6c81f266c 100644 --- a/src/quick/items/qquicktext.cpp +++ b/src/quick/items/qquicktext.cpp @@ -1179,8 +1179,8 @@ QRectF QQuickTextPrivate::setupTextLayout(qreal *const baseline) QTextLine firstLine = visibleCount == 1 && elideLayout ? elideLayout->lineAt(0) : layout.lineAt(0); - Q_ASSERT(firstLine.isValid()); - *baseline = firstLine.y() + firstLine.ascent(); + if (firstLine.isValid()) + *baseline = firstLine.y() + firstLine.ascent(); if (!customLayout) br.setHeight(height); |