[neon/qt/qtbase/Neon/release] debian/patches: more upstream patches that have been applied

[Harald Sitter]

Git commit 9193ed421e0364cc3e6aea5e7b3307f2c54ba9b7 by Harald Sitter.
Committed on 13/09/2022 at 09:42.
Pushed by sitter into branch 'Neon/release'.

more upstream patches that have been applied

actually I'm not sure they have been since for me the patch applies properly :shrug:

D  +0    -33   debian/patches/full_width_selection_rtl.diff
M  +1    -1    debian/patches/series

https://invent.kde.org/neon/qt/qtbase/commit/9193ed421e0364cc3e6aea5e7b3307f2c54ba9b7

diff --git a/debian/patches/full_width_selection_rtl.diff b/debian/patches/full_width_selection_rtl.diff
deleted file mode 100644
index 36d676c..0000000
--- a/debian/patches/full_width_selection_rtl.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: fix QTextFormat::FullWidthSelection for right-to-left text layouts
- Using the QTextFormat::FullWidthSelection property to select a line
- would previously not take into account right-to-left text layouts.
- .
- With this patch, the whole line should now be drawn correctly for both
- left-to-right, and right-to-left layouts.
-Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=a7894855f2f59028
-Last-Update: 2021-08-15
-
---- a/src/gui/text/qtextlayout.cpp
-+++ b/src/gui/text/qtextlayout.cpp
-@@ -1173,10 +1173,17 @@ void QTextLayout::draw(QPainter *p, cons
-                 QRectF fullLineRect(tl.rect());
-                 fullLineRect.translate(position);
-                 fullLineRect.setRight(QFIXED_MAX);
--                if (!selectionEndInLine)
--                    region.addRect(clipIfValid(QRectF(lineRect.topRight(), fullLineRect.bottomRight()), clip));
--                if (!selectionStartInLine)
--                    region.addRect(clipIfValid(QRectF(fullLineRect.topLeft(), lineRect.bottomLeft()), clip));
-+
-+                const bool rightToLeft = d->isRightToLeft();
-+
-+                if (!selectionEndInLine) {
-+                    region.addRect(clipIfValid(rightToLeft ? QRectF(fullLineRect.topLeft(), lineRect.bottomLeft())
-+                                                           : QRectF(lineRect.topRight(), fullLineRect.bottomRight()), clip));
-+                }
-+                if (!selectionStartInLine) {
-+                    region.addRect(clipIfValid(rightToLeft ? QRectF(lineRect.topRight(), fullLineRect.bottomRight())
-+                                                           : QRectF(fullLineRect.topLeft(), lineRect.bottomLeft()), clip));
-+                }
-             } else if (!selectionEndInLine
-                 && isLastLineInBlock
-                 &&!(d->option.flags() & QTextOption::ShowLineAndParagraphSeparators)) {
diff --git a/debian/patches/series b/debian/patches/series
index db64489..d3b5b51 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,7 @@
 #mime_globs.diff
 #fix-misplacement-of-placeholder-text-in-QLineEdit.diff
 #fix-placement-of-placeholder-text-in-QLineEdits-with-action-icons.diff
-full_width_selection_rtl.diff
+#full_width_selection_rtl.diff
 fix_recursion_crash.diff
 #mysql_field_readonly.diff
 #CVE-2021-38593.diff