diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-04-07 15:22:02 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-04-07 15:22:02 +0300 |
| commit | 04ea6df18a2b06efd133a4f1b13c2e38817279ae (patch) | |
| tree | 73b84355c755c6e21f3f66816aeb13e6a16012cd /src/quick/items/qquicktext.cpp | |
| parent | 4bb06cfba94bcc9ddf30d968a227d00479d475b7 (diff) | |
| parent | 1089f8f226d546aef3b032a2f4391e08a3afa48d (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.4' into tqtc/lts-5.15-opensourcev5.15.4-lts-lgpl
Change-Id: I39595f8b7ad212c842709b939226d95531819391
Diffstat (limited to 'src/quick/items/qquicktext.cpp')
| -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 b18d03a20a..6230186933 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); |