aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items
diff options
context:
space:
mode:
authorShinichi Okada <shinichi.okada@qt.io>2020-11-17 14:15:50 +0900
committerFabian Kosmale <fabian.kosmale@qt.io>2020-11-20 09:31:07 +0000
commitae1b9c6d94001411efeef600e22638906e0fa990 (patch)
tree44e614195aa4d0e397b93c2a7436bc11a50354c0 /src/quick/items
parent861d93965e0dbc2c088e83f8a6093a639373a02c (diff)
QML Text doesn't reset lineCount when text is empty
lineCount is not reset when replacing a multi-line QML Text 'text' property with an "" empty string. Also, the lineCountChanged signal is not emitted Pick-to: 5.15 Task-number: QTBUG-84458 Change-Id: Ic3c02e6a90e6675eadbaafc6af6ab0356ee98123 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/quick/items')
-rw-r--r--src/quick/items/qquicktext.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp
index 384b395f70..0546f80fd5 100644
--- a/src/quick/items/qquicktext.cpp
+++ b/src/quick/items/qquicktext.cpp
@@ -399,6 +399,8 @@ void QQuickTextPrivate::updateSize()
layedOutTextRect = QRectF(0, 0, 0, fontHeight);
advance = QSizeF();
signalSizeChange(previousSize);
+ lineCount = 1;
+ emit q->lineCountChanged();
updateType = UpdatePaintNode;
q->update();
return;