src/declarative/util/qdeclarativestyledtext.cpp
changeset 33 3e2da88830cd
parent 30 5dc02b23752f
--- a/src/declarative/util/qdeclarativestyledtext.cpp	Tue Jul 06 15:10:48 2010 +0300
+++ b/src/declarative/util/qdeclarativestyledtext.cpp	Wed Aug 18 10:37:55 2010 +0300
@@ -152,8 +152,6 @@
                 QTextCharFormat format;
                 if (formatStack.count())
                     format = formatStack.top();
-                else
-                    format.setFont(baseFont);
                 if (parseTag(ch, text, drawText, format))
                     formatStack.push(format);
             }
@@ -198,8 +196,10 @@
             if (char0 == QLatin1Char('b')) {
                 if (tagLength == 1)
                     format.setFontWeight(QFont::Bold);
-                else if (tagLength == 2 && tag.at(1) == QLatin1Char('r'))
+                else if (tagLength == 2 && tag.at(1) == QLatin1Char('r')) {
                     textOut.append(QChar(QChar::LineSeparator));
+                    return false;
+                }
             } else if (char0 == QLatin1Char('i')) {
                 if (tagLength == 1)
                     format.setFontItalic(true);