[neon/qt/qtdeclarative/Neon/release] debian: Add support for &apos in styled text and document it.

[Lisandro Damián Nicanor Pérez Meyer]

Git commit e9d517758f61cf98172eace003e0740f7f069bdb by Lisandro Damián Nicanor Pérez Meyer.
Committed on 31/05/2021 at 22:53.
Pushed by jriddell into branch 'Neon/release'.

Add support for &apos in styled text and document it.

Backported from KDE's tree.

M  +3    -0    debian/changelog
M  +1    -0    debian/patches/series
A  +33   -0    debian/patches/support_apos_in_styled_text.patch

https://invent.kde.org/neon/qt/qtdeclarative/commit/e9d517758f61cf98172eace003e0740f7f069bdb

diff --git a/debian/changelog b/debian/changelog
index b260463..a3f2ee4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qtdeclarative-opensource-src (5.15.2+dfsg-6) UNRELEASED; urgency=medium
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Backport patch to support &appos in styled text, along with it's
+    documentation.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 31 May 2021 19:41:22 -0300
 
diff --git a/debian/patches/series b/debian/patches/series
index d54423d..ddab96d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,7 @@ qmltime-tool.patch
 fix_qml_property_cache_leaks.patch
 gcc_11.patch
 tst_qmldiskcache_big_endian.patch
+support_apos_in_styled_text.patch
 
 # Debian patches
 disableopengltests.patch
diff --git a/debian/patches/support_apos_in_styled_text.patch b/debian/patches/support_apos_in_styled_text.patch
new file mode 100644
index 0000000..83225cf
--- /dev/null
+++ b/debian/patches/support_apos_in_styled_text.patch
@@ -0,0 +1,33 @@
+Description: Support ' in styled text and document it
+ This ensures that some translations really look ok.
+Origin: https://invent.kde.org/qt/qt/qtdeclarative/-/merge_requests/3/diffs
+Forwarded: not-needed
+Author: Albert Astals Cid
+Applied-Upstream: https://invent.kde.org/qt/qt/qtdeclarative/-/commit/0dda47d9f1a22567ad8f1266be2f0cd8a9226c7f
+
+diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp
+index 581ab9f76a41b731126eb53aa7069a21d7c96c76..4ddd2a41bc9290d09412b7904c3561ccfb65a6a8 100644
+--- a/src/quick/items/qquicktext.cpp
++++ b/src/quick/items/qquicktext.cpp
+@@ -2168,7 +2168,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 d531fc92051b4a966a29ea4c463c7d5ca79a7ab3..a25af90414bc4e29efe02c773bf19645a272b93c 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"))