summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qtextdocument.cpp
diff options
context:
space:
mode:
authorAndy Shaw <qt-info@nokia.com>2010-06-21 12:07:20 +0200
committerAndy Shaw <qt-info@nokia.com>2010-06-21 12:07:20 +0200
commit1fb24d6852e34bd58f35172dea4bfd4c41236689 (patch)
tree56833ba529fdd5b30cbf4da8d1287241c337bf36 /src/gui/text/qtextdocument.cpp
parente271abb694c232f746b43544334667f4b3ccc1d0 (diff)
Make sure that <br/> is seen as a valid tag in Qt::mightBeRichText()
The W3C online markup validation test verifies that <br/> is indeed valid XHTML and <br /> is also valid so this ensures that this case is accounted for. The existing test was expanded to accout for each of these cases. Task-number: QTBUG-1786 Reviewed-by: Eskil Abrahamsen Blomfeldt
Diffstat (limited to 'src/gui/text/qtextdocument.cpp')
-rw-r--r--src/gui/text/qtextdocument.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp
index c7a9756a3c..65e88ab297 100644
--- a/src/gui/text/qtextdocument.cpp
+++ b/src/gui/text/qtextdocument.cpp
@@ -127,6 +127,8 @@ bool Qt::mightBeRichText(const QString& text)
tag += text[i];
else if (!tag.isEmpty() && text[i].isSpace())
break;
+ else if (!tag.isEmpty() && text[i] == QLatin1Char('/') && i + 1 == close)
+ break;
else if (!text[i].isSpace() && (!tag.isEmpty() || text[i] != QLatin1Char('!')))
return false; // that's not a tag
}