Blame SOURCES/0004-Support-apos-in-styled-text.patch

50d94e
From bac7823a97ab901abc8da392ba23747feac4c933 Mon Sep 17 00:00:00 2001
b602f4
From: Albert Astals Cid <albert.astals.cid@kdab.com>
b602f4
Date: Fri, 21 May 2021 13:42:35 +0200
50d94e
Subject: [PATCH 04/20] Support ' in styled text
b602f4
b602f4
Pick-to: 6.1 5.15
b602f4
Change-Id: I4a8db963e52a7899ab1796f9a560e8029cc1c929
b602f4
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
b602f4
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
b602f4
(cherry picked from commit 96b528efcba1226d2980828d1255160bdceae4cf)
b602f4
---
b602f4
 src/quick/items/qquicktext.cpp      | 2 +-
b602f4
 src/quick/util/qquickstyledtext.cpp | 2 ++
b602f4
 2 files changed, 3 insertions(+), 1 deletion(-)
b602f4
b602f4
diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp
50d94e
index 43c29d1f58..459dea8f74 100644
b602f4
--- a/src/quick/items/qquicktext.cpp
b602f4
+++ b/src/quick/items/qquicktext.cpp
b602f4
@@ -2168,7 +2168,7 @@ void QQuickText::resetMaximumLineCount()
b602f4
      - inline images
b602f4
     
    ,
      and
    • - ordered and unordered lists
b602f4
     
 - preformatted
b602f4
-    > < & "  
b602f4
+    > < & "   '
b602f4
     \endcode
b602f4
 
b602f4
     \c Text.StyledText parser is strict, requiring tags to be correctly nested.
b602f4
diff --git a/src/quick/util/qquickstyledtext.cpp b/src/quick/util/qquickstyledtext.cpp
b602f4
index d531fc9205..a25af90414 100644
b602f4
--- a/src/quick/util/qquickstyledtext.cpp
b602f4
+++ b/src/quick/util/qquickstyledtext.cpp
b602f4
@@ -564,6 +564,8 @@ void QQuickStyledTextPrivate::parseEntity(const QChar *&ch, const QString &textI
b602f4
                 textOut += QChar(60);
b602f4
             else if (entity == QLatin1String("amp"))
b602f4
                 textOut += QChar(38);
b602f4
+            else if (entity == QLatin1String("apos"))
b602f4
+                textOut += QChar(39);
b602f4
             else if (entity == QLatin1String("quot"))
b602f4
                 textOut += QChar(34);
b602f4
             else if (entity == QLatin1String("nbsp"))
b602f4
-- 
50d94e
2.35.1
b602f4