[neon/qt/qtbase/Neon/testing] debian/patches: remove patch in tar
Jonathan Riddell
null at kde.org
Wed Dec 2 10:55:22 GMT 2020
Git commit 79220ed33063ec457f5cf21a767ebaaa39544d00 by Jonathan Riddell.
Committed on 02/12/2020 at 10:55.
Pushed by jriddell into branch 'Neon/testing'.
remove patch in tar
D +0 -83 debian/patches/qtbase.git-65243ad7aef48af4689ea4454916b504025b5051.patch
D +0 -47 debian/patches/qtbase.git-de811eca72d17b7ef734afc1d44af00cc5952f22.patch
M +0 -1 debian/patches/series
https://invent.kde.org/neon/qt/qtbase/commit/79220ed33063ec457f5cf21a767ebaaa39544d00
diff --git a/debian/patches/qtbase.git-65243ad7aef48af4689ea4454916b504025b5051.patch b/debian/patches/qtbase.git-65243ad7aef48af4689ea4454916b504025b5051.patch
deleted file mode 100644
index 5ee94f0..0000000
--- a/debian/patches/qtbase.git-65243ad7aef48af4689ea4454916b504025b5051.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From: Friedemann Kleint <Friedemann.Kleint at qt.io>
-Date: Fri, 25 Sep 2020 12:10:58 +0000 (+0200)
-Subject: Emit QScreen::geometryChanged when the logical DPI changes
-X-Git-Url: https://codereview.qt-project.org/gitweb?p=qt%2Fqtbase.git;a=commitdiff_plain;h=65243ad7aef48af4689ea4454916b504025b5051;hp=37f5c4a3ee314ac671c07bea6ebf5ae985013cc1
-
-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.
-
-Amends 5290027e3bab75f14fc0a2b7c206594d9cb91e76.
-
-Task-number: QTBUG-76902
-Task-number: QTBUG-79248
-Fixes: QTBUG-86604
-Change-Id: I3dc2ec5ccd9c6413e92f9246242f323e8afc5e57
-Reviewed-by: David Edmundson <davidedmundson at kde.org>
-(cherry picked from commit 5c7307775d32ae0a54acad8ae7a1c9d3cff7d45e)
-Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot at qt-project.org>
----
-
-diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
-index 239a78313c5..ef090605819 100644
---- a/src/gui/kernel/qguiapplication.cpp
-+++ b/src/gui/kernel/qguiapplication.cpp
-@@ -3162,13 +3162,14 @@ void QGuiApplicationPrivate::processScreenGeometryChange(QWindowSystemInterfaceP
- 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::processScreenGeometryChange(QWindowSystemInterfaceP
- updateFilteredScreenOrientation(s);
- }
-
-- s->d_func()->emitGeometryChangeSignals(geometryChanged, availableGeometryChanged);
--
- resetCachedDevicePixelRatio();
- }
-
-diff --git a/src/gui/kernel/qscreen.cpp b/src/gui/kernel/qscreen.cpp
-index df628fcc73a..a1afc1ba143 100644
---- a/src/gui/kernel/qscreen.cpp
-+++ b/src/gui/kernel/qscreen.cpp
-@@ -88,6 +88,9 @@ void QScreenPrivate::updateGeometriesWithSignals()
- 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::emitGeometryChangeSignals(bool geometryChanged, bool availa
- 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/qtbase.git-de811eca72d17b7ef734afc1d44af00cc5952f22.patch b/debian/patches/qtbase.git-de811eca72d17b7ef734afc1d44af00cc5952f22.patch
deleted file mode 100644
index 2ae3143..0000000
--- a/debian/patches/qtbase.git-de811eca72d17b7ef734afc1d44af00cc5952f22.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From de811eca72d17b7ef734afc1d44af00cc5952f22 Mon Sep 17 00:00:00 2001
-From: Dmitry Kazakov <dimula73 at gmail.com>
-Date: Mon, 11 Mar 2019 13:18:06 +0300
-Subject: [PATCH] Synthesize Enter/LeaveEvent for accepted QTabletEvent
-
-When the tablet event is accepted, then Qt doesn't synthesize a mouse
-event, it means that QApplicationPrivate::sendMouseEvent() will not be
-called, and, therefore, enter/leave events will not be dispatched.
-
-The patch looks a bit hackish. Ideally, the synthesize should happen
-in QGuiApplicationPrivate::processTabletEvent(), which takes the decision
-about synthesizing mouse events. But there is not enough information
-on this level: neither qt_last_mouse_receiver nor the receiver widget
-are known at this stage.
-
-On Windows and other platforms where there is a parallel stream of
-mouse events synthesized by the platform, we shouldn't generate these
-events manually.
-
-Change-Id: Ifbad6284483ee282ad129db54606f5d0d9ddd633
----
- src/widgets/kernel/qwidgetwindow.cpp | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-Index: qtbase-everywhere-src-5.15.0/src/widgets/kernel/qwidgetwindow.cpp
-===================================================================
---- qtbase-everywhere-src-5.15.0.orig/src/widgets/kernel/qwidgetwindow.cpp
-+++ qtbase-everywhere-src-5.15.0/src/widgets/kernel/qwidgetwindow.cpp
-@@ -1084,6 +1084,18 @@ void QWidgetWindow::handleTabletEvent(QT
- event->setAccepted(ev.isAccepted());
- }
-
-+ /**
-+ * Synthesize Enter/Leave events if it is requested by the system and user
-+ */
-+ if (widget != qt_last_mouse_receiver &&
-+ event->isAccepted() &&
-+ !QWindowSystemInterfacePrivate::TabletEvent::platformSynthesizesMouse &&
-+ qApp->testAttribute(Qt::AA_SynthesizeMouseForUnhandledTabletEvents)) {
-+
-+ QApplicationPrivate::dispatchEnterLeave(widget, qt_last_mouse_receiver, event->globalPos());
-+ qt_last_mouse_receiver = widget;
-+ }
-+
- if (event->type() == QEvent::TabletRelease && event->buttons() == Qt::NoButton)
- qt_tablet_target = nullptr;
- }
diff --git a/debian/patches/series b/debian/patches/series
index 9b36ddd..17a775c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,4 +9,3 @@ nonlinux_utime.diff
qdoc_default_incdirs.diff
path_max.diff
qstorageinfo_linux.diff
-qtbase.git-65243ad7aef48af4689ea4454916b504025b5051.patch
More information about the Neon-commits
mailing list