diff options
| author | Albert Astals Cid <albert.astals.cid@kdab.com> | 2021-05-21 13:42:35 +0200 |
|---|---|---|
| committer | Albert Astals Cid <albert.astals.cid@kdab.com> | 2021-05-28 15:38:45 +0200 |
| commit | e26d9ec1bd1c82bfd48f147d3a74b045ca656769 (patch) | |
| tree | 8892820603ada73ca87d27af6432b2762c3dc04d | |
| parent | b140d12fca7228e6234c2acd7d3c1a17d0cb850f (diff) | |
| download | qtdeclarative-e26d9ec1bd1c82bfd48f147d3a74b045ca656769.tar.gz | |
Support ' in styled text
Includes the doc fixes from 5848c081c094a66e024493fc1e5c2569e06f73b6
(that had not been marked for backporting to 6.1)
Change-Id: I4a8db963e52a7899ab1796f9a560e8029cc1c929
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
(cherry picked from commit 96b528efcba1226d2980828d1255160bdceae4cf)
| -rw-r--r-- | src/quick/items/qquicktext.cpp | 2 | ||||
| -rw-r--r-- | src/quick/util/qquickstyledtext.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp index 10399b4e27..efb10bed48 100644 --- a/src/quick/items/qquicktext.cpp +++ b/src/quick/items/qquicktext.cpp @@ -2171,7 +2171,7 @@ void QQuickText::resetMaximumLineCount() <img src="" align="top,middle,bottom" width="" height=""> - inline images <ol type="">, <ul type=""> and <li> - ordered and unordered lists <pre></pre> - preformatted - > < & + > < & " ' \endcode \c Text.StyledText parser is strict, requiring tags to be correctly nested. diff --git a/src/quick/util/qquickstyledtext.cpp b/src/quick/util/qquickstyledtext.cpp index fcbaf66337..96f5ce4d57 100644 --- a/src/quick/util/qquickstyledtext.cpp +++ b/src/quick/util/qquickstyledtext.cpp @@ -564,6 +564,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("apos")) + textOut += QChar(39); else if (entity == QLatin1String("quot")) textOut += QChar(34); else if (entity == QLatin1String("nbsp")) |