aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/qquickstyledtext
diff options
context:
space:
mode:
authorJohn Brooks <john.brooks@jollamobile.com>2013-10-23 20:56:08 -0600
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-24 10:04:12 +0200
commitaa1760f84bd711cf56159075630fb71d38a4087b (patch)
tree8800262dbadf32ddb49280caee615e0c92f796cf /tests/auto/quick/qquickstyledtext
parentd61b94bcf8b12cbe397bae849196ce37d6fddf97 (diff)
Allow &quot; in QQuickStyledText
QString::toHtmlEscaped generates &quot;. QQuickStyledText should be symmetrical with that function. Change-Id: I67ea0abe446b5fa1edb53258dca58b84af910e28 Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
Diffstat (limited to 'tests/auto/quick/qquickstyledtext')
-rw-r--r--tests/auto/quick/qquickstyledtext/tst_qquickstyledtext.cpp2
1 files changed, 1 insertions, 1 deletions
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") << "&lt;b&gt;this &amp; that&lt;/b&gt;" << "<b>this & that</b>" << FormatList() << false;
+ QTest::newRow("entities") << "&lt;b&gt;&quot;this&quot; &amp; that&lt;/b&gt;" << "<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;