projects
/
platform
/
upstream
/
qtdeclarative.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
054a1e9
)
Clear Text formatting when setting plain text content.
author
Andrew den Exter
<andrew.den-exter@nokia.com>
Mon, 30 Jan 2012 02:44:10 +0000
(12:44 +1000)
committer
Qt by Nokia
<qt-info@nokia.com>
Thu, 2 Feb 2012 01:36:03 +0000
(
02:36
+0100)
Task-number: QTBUG-21919
Change-Id: I55605d2bd053968868a885e63cc4bc042ada0839
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
src/quick/items/qquicktext.cpp
patch
|
blob
|
history
diff --git
a/src/quick/items/qquicktext.cpp
b/src/quick/items/qquicktext.cpp
index
0d4db31
..
16fbc85
100644
(file)
--- a/
src/quick/items/qquicktext.cpp
+++ b/
src/quick/items/qquicktext.cpp
@@
-306,6
+306,7
@@
void QQuickTextPrivate::updateLayout()
if (!layout.text().isEmpty())
layout.setText(text);
} else if (!styledText) {
+ layout.clearAdditionalFormats();
QString tmp = text;
tmp.replace(QLatin1Char('\n'), QChar::LineSeparator);
singleline = !tmp.contains(QChar::LineSeparator);