summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2010-10-29 00:51:20 (GMT)
committerAlan Alpert <alan.alpert@nokia.com>2010-10-29 00:51:20 (GMT)
commit2c2e16dc5b43536eba6cb89c93401fed8f3c26a8 (patch)
treea98573f8e007432866e55dbd6aea19f39c91cb67 /src/declarative
parent47448f58b73add569137ced50667c1e42bbcea75 (diff)
downloadQt-2c2e16dc5b43536eba6cb89c93401fed8f3c26a8.zip
Qt-2c2e16dc5b43536eba6cb89c93401fed8f3c26a8.tar.gz
Qt-2c2e16dc5b43536eba6cb89c93401fed8f3c26a8.tar.bz2
Update when text changes to ""
Also fixes a doc typo. Includes test. Task-number: QTBUG-14469
Diffstat (limited to 'src/declarative')
-rw-r--r--src/declarative/graphicsitems/qdeclarativetext.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetext.cpp b/src/declarative/graphicsitems/qdeclarativetext.cpp
index c8e3615..865af2d 100644
--- a/src/declarative/graphicsitems/qdeclarativetext.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetext.cpp
@@ -221,6 +221,7 @@ void QDeclarativeTextPrivate::updateSize()
if (text.isEmpty()) {
q->setImplicitHeight(fm.height());
emit q->paintedSizeChanged();
+ q->update();
return;
}
@@ -866,7 +867,7 @@ void QDeclarativeText::setStyleColor(const QColor &color)
and \c Text.AlignVCenter.
Note that for a single line of text, the size of the text is the area of the text. In this common case,
- all alignments are equivalent. If you want the text to be, say, centered in it parent, then you will
+ all alignments are equivalent. If you want the text to be, say, centered in its parent, then you will
need to either modify the Item::anchors, or set horizontalAlignment to Text.AlignHCenter and bind the width to
that of the parent.
*/