[neon/qt/qtbase/Neon/testing] debian: Drop two upstream patches, included in 5.15.2.

[Dmitry Shachnev]

Git commit 358fdee6d5bfa5b3199fdf48ceafe88dbbdc65b4 by Dmitry Shachnev.
Committed on 17/11/2020 at 12:29.
Pushed by sitter into branch 'Neon/testing'.

Drop two upstream patches, included in 5.15.2.

M  +1    -4    debian/changelog
D  +0    -64   debian/patches/emit_geometry_changed.diff
D  +0    -41   debian/patches/qlineedit_fix_cursor_drawing_issues.diff
M  +0    -2    debian/patches/series

https://invent.kde.org/neon/qt/qtbase/commit/358fdee6d5bfa5b3199fdf48ceafe88dbbdc65b4

diff --git a/debian/changelog b/debian/changelog
index a195b15..a7cc7c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,8 @@
 qtbase-opensource-src (5.15.2+dfsg-1) UNRELEASED; urgency=medium
 
-  [ Lu Yaning ]
-  * Backport qlineedit_fix_cursor_drawing_issues.diff, fixing stale pixels left
-    behind while entering Chinese on English environments.
-
   [ Dmitry Shachnev ]
   * New upstream release.
+  * Drop emit_geometry_changed.diff, included in the new release.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 04 Nov 2020 11:53:04 -0300
 
diff --git a/debian/patches/emit_geometry_changed.diff b/debian/patches/emit_geometry_changed.diff
deleted file mode 100644
index 3490722..0000000
--- a/debian/patches/emit_geometry_changed.diff
+++ /dev/null
@@ -1,64 +0,0 @@
-Description: emit QScreen::geometryChanged when the logical DPI changes
- Add the missing call to QScreenPrivate::emitGeometryChangeSignals()
- along with an emission of physicalDotsPerInchChanged()
- since that is calculated from geometry and physical size.
- .
- Rearrange the code in
- QGuiApplicationPrivate::processScreenGeometryChange()
- to prevent duplicate emissions of geometryChanged(),
- physicalDotsPerInchChanged() which this change would introduce.
-Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=5c7307775d32ae0a
-Last-Update: 2020-09-30
-
---- a/src/gui/kernel/qguiapplication.cpp
-+++ b/src/gui/kernel/qguiapplication.cpp
-@@ -3162,13 +3162,14 @@ void QGuiApplicationPrivate::processScre
-     bool availableGeometryChanged = e->availableGeometry != s->d_func()->availableGeometry;
-     s->d_func()->availableGeometry = e->availableGeometry;
- 
--    if (geometryChanged) {
--        Qt::ScreenOrientation primaryOrientation = s->primaryOrientation();
-+    const Qt::ScreenOrientation primaryOrientation = s->primaryOrientation();
-+    if (geometryChanged)
-         s->d_func()->updatePrimaryOrientation();
- 
--        emit s->geometryChanged(s->geometry());
-+    s->d_func()->emitGeometryChangeSignals(geometryChanged, availableGeometryChanged);
-+
-+    if (geometryChanged) {
-         emit s->physicalSizeChanged(s->physicalSize());
--        emit s->physicalDotsPerInchChanged(s->physicalDotsPerInch());
-         emit s->logicalDotsPerInchChanged(s->logicalDotsPerInch());
- 
-         if (s->primaryOrientation() != primaryOrientation)
-@@ -3178,8 +3179,6 @@ void QGuiApplicationPrivate::processScre
-             updateFilteredScreenOrientation(s);
-     }
- 
--    s->d_func()->emitGeometryChangeSignals(geometryChanged, availableGeometryChanged);
--
-     resetCachedDevicePixelRatio();
- }
- 
---- a/src/gui/kernel/qscreen.cpp
-+++ b/src/gui/kernel/qscreen.cpp
-@@ -88,6 +88,9 @@ void QScreenPrivate::updateGeometriesWit
- void QScreenPrivate::emitGeometryChangeSignals(bool geometryChanged, bool availableGeometryChanged)
- {
-     Q_Q(QScreen);
-+    if (geometryChanged)
-+        emit q->geometryChanged(geometry);
-+
-     if (availableGeometryChanged)
-         emit q->availableGeometryChanged(availableGeometry);
- 
-@@ -96,6 +99,9 @@ void QScreenPrivate::emitGeometryChangeS
-         for (QScreen* sibling : siblings)
-             emit sibling->virtualGeometryChanged(sibling->virtualGeometry());
-     }
-+
-+    if (geometryChanged)
-+        emit q->physicalDotsPerInchChanged(q->physicalDotsPerInch());
- }
- 
- void QScreenPrivate::setPlatformScreen(QPlatformScreen *screen)
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..9635796 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
 # Backported from upstream.
-emit_geometry_changed.diff
-qlineedit_fix_cursor_drawing_issues.diff
 
 # Debian specific.
 gnukfreebsd.diff