diff options
| -rw-r--r-- | src/quick/util/qquickstyledtext.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/quick/qquickstyledtext/tst_qquickstyledtext.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/quick/util/qquickstyledtext.cpp b/src/quick/util/qquickstyledtext.cpp index b8f3ecf7d6..f2b2d2af06 100644 --- a/src/quick/util/qquickstyledtext.cpp +++ b/src/quick/util/qquickstyledtext.cpp @@ -548,6 +548,8 @@ void QQuickStyledTextPrivate::parseEntity(const QChar *&ch, const QString &textI textOut += QChar(60); else if (entity == QLatin1String("amp")) textOut += QChar(38); + else if (entity == QLatin1String("quot")) + textOut += QChar(34); return; } ++entityLength; diff --git a/tests/auto/quick/qquickstyledtext/tst_qquickstyledtext.cpp b/tests/auto/quick/qquickstyledtext/tst_qquickstyledtext.cpp index 9351919ee8..4e9ceba2a2 100644 --- a/tests/auto/quick/qquickstyledtext/tst_qquickstyledtext.cpp +++ b/tests/auto/quick/qquickstyledtext/tst_qquickstyledtext.cpp @@ -119,7 +119,7 @@ void tst_qquickstyledtext::textOutput_data() QTest::newRow("font bad 2") << "<font size=\"1>text</font>" << "" << FormatList() << false; QTest::newRow("extra close") << "<b>text</b></b>" << "text" << (FormatList() << Format(Format::Bold, 0, 4)) << false; QTest::newRow("extra space") << "<b >text</b>" << "text" << (FormatList() << Format(Format::Bold, 0, 4)) << false; - QTest::newRow("entities") << "<b>this & that</b>" << "<b>this & that</b>" << FormatList() << false; + QTest::newRow("entities") << "<b>"this" & that</b>" << "<b>\"this\" & that</b>" << FormatList() << false; QTest::newRow("newline") << "text<br>more text" << QLatin1String("text") + QChar(QChar::LineSeparator) + QLatin1String("more text") << FormatList() << false; QTest::newRow("self-closing newline") << "text<br/>more text" << QLatin1String("text") + QChar(QChar::LineSeparator) + QLatin1String("more text") << FormatList() << false; QTest::newRow("paragraph") << "text<p>more text" << QLatin1String("text") + QChar(QChar::LineSeparator) + QLatin1String("more text") << FormatList() << false; |