[neon/qt/qtbase/Neon/testing] debian: Remove Lu Yaning's patch, it's alreapreent in the tarball.

[Lisandro Damián Nicanor Pérez Meyer]

Git commit 0381a9a4284285aa3c4bb888daaedf62866d7ed5 by Lisandro Damián Nicanor Pérez Meyer.
Committed on 17/11/2020 at 12:49.
Pushed by sitter into branch 'Neon/testing'.

Remove Lu Yaning's patch, it's alreapreent in the tarball.

My fault, I clearly mislooked at the upstream's branch it was applied.

M  +0    -8    debian/changelog
D  +0    -41   debian/patches/qlineedit_fix_cursor_drawing_issues.diff
M  +0    -1    debian/patches/series

https://invent.kde.org/neon/qt/qtbase/commit/0381a9a4284285aa3c4bb888daaedf62866d7ed5

diff --git a/debian/changelog b/debian/changelog
index 6374927..0d8faa5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,3 @@
-qtbase-opensource-src (5.15.1+dfsg-3) UNRELEASED; urgency=medium
-
-  [ Lu Yaning ]
-  * Backport qlineedit_fix_cursor_drawing_issues.diff, fixing stale pixels left
-    behind while entering Chinese on English environments.
-
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 04 Nov 2020 11:53:04 -0300
-
 qtbase-opensource-src (5.15.1+dfsg-2) unstable; urgency=medium
 
   [ Dmitry Shachnev ]
diff --git a/debian/patches/qlineedit_fix_cursor_drawing_issues.diff b/debian/patches/qlineedit_fix_cursor_drawing_issues.diff
deleted file mode 100644
index d8ce6e5..0000000
--- a/debian/patches/qlineedit_fix_cursor_drawing_issues.diff
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: QLineEdit: Fix cursor drawing issues
- Entering Chinese in some fonts in an English environment causes
- the cursor drawing coordinates to exceed the updated coordinates,
- leaving behind stale pixels at the top.
- .
- Keep the refresh and draw area calculation methods the same when
- rendering the contents in QLineEdit::paintEvent, and when
- calculating the update area in
- QLineEditPrivate::adjustedControlRect.
-Origin: upstream, https://codereview.qt-project.org/c/qt/qtbase/+/308158
-Last-Update: 2020-07-23
-
---- a/src/widgets/widgets/qlineedit.cpp
-+++ b/src/widgets/widgets/qlineedit.cpp
-@@ -2031,6 +2031,7 @@
-     }
- 
-     // the y offset is there to keep the baseline constant in case we have script changes in the text.
-+    // Needs to be kept in sync with QLineEditPrivate::adjustedControlRect
-     QPoint topLeft = lineRect.topLeft() - QPoint(d->hscroll, d->control->ascent() - fm.ascent());
- 
-     // draw text, selections and cursors
-diff --git a/src/widgets/widgets/qlineedit_p.cpp b/src/widgets/widgets/qlineedit_p.cpp
-index 6424c14..05b14b1 100644
---- a/src/widgets/widgets/qlineedit_p.cpp
-+++ b/src/widgets/widgets/qlineedit_p.cpp
-@@ -70,12 +70,13 @@
- const int QLineEditPrivate::verticalMargin(1);
- const int QLineEditPrivate::horizontalMargin(2);
- 
-+// Needs to be kept in sync with QLineEdit::paintEvent
- QRect QLineEditPrivate::adjustedControlRect(const QRect &rect) const
- {
-     QRect widgetRect = !rect.isEmpty() ? rect : q_func()->rect();
-     QRect cr = adjustedContentsRect();
-     int cix = cr.x() - hscroll + horizontalMargin;
--    return widgetRect.translated(QPoint(cix, vscroll));
-+    return widgetRect.translated(QPoint(cix, vscroll - control->ascent() + q_func()->fontMetrics().ascent()));
- }
- 
- int QLineEditPrivate::xToPos(int x, QTextLine::CursorPosition betweenOrOn) const
diff --git a/debian/patches/series b/debian/patches/series
index 2259cba..a30b9b8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 # Backported from upstream.
 emit_geometry_changed.diff
-qlineedit_fix_cursor_drawing_issues.diff
 
 # Debian specific.
 gnukfreebsd.diff