aboutsummaryrefslogtreecommitdiffstats
path: root/src
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 /src
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 'src')
-rw-r--r--src/quick/util/qquickstyledtext.cpp2
1 files changed, 2 insertions, 0 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;