diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2010-07-05 02:04:55 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2010-07-05 02:04:55 (GMT) |
| commit | e0dd90bfe47a7e95ad9444b4a62dc1f426dee7fe (patch) | |
| tree | 7d5b9210719d073b2e70a592acd01cdafeaf95f8 | |
| parent | 0085cfa78a712a7afbbbeb90a3d1149328b4d2fd (diff) | |
| download | Qt-e0dd90bfe47a7e95ad9444b4a62dc1f426dee7fe.zip Qt-e0dd90bfe47a7e95ad9444b4a62dc1f426dee7fe.tar.gz Qt-e0dd90bfe47a7e95ad9444b4a62dc1f426dee7fe.tar.bz2 | |
<br/> shouldn't trigger a new format range in QDeclarativeStyledText.
| -rw-r--r-- | src/declarative/util/qdeclarativestyledtext.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/declarative/util/qdeclarativestyledtext.cpp b/src/declarative/util/qdeclarativestyledtext.cpp index 9b4955e..91566bc 100644 --- a/src/declarative/util/qdeclarativestyledtext.cpp +++ b/src/declarative/util/qdeclarativestyledtext.cpp @@ -196,8 +196,10 @@ bool QDeclarativeStyledTextPrivate::parseTag(const QChar *&ch, const QString &te 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); |