[neon/qt/qtdeclarative/Neon/release] debian/patches: remove patch in tar

Jonathan Esk-Riddell null at kde.org
Mon Jan 9 10:15:43 GMT 2023


Git commit beea244f8b2b746a995f083bd81a87407d52aca9 by Jonathan Esk-Riddell.
Committed on 09/01/2023 at 10:15.
Pushed by jriddell into branch 'Neon/release'.

remove patch in tar

M  +0    -1    debian/patches/series
D  +0    -37   debian/patches/use_delay_properly_in_mousewheel.patch

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

diff --git a/debian/patches/series b/debian/patches/series
index 8dfe8c8..05ab2fe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,7 +5,6 @@ tst_qmldiskcache_big_endian.patch
 #support_apos_in_styled_text.patch
 #fix_sweep_step.patch
 #fix_flickable_wheel_velocity_calculation.patch
-use_delay_properly_in_mousewheel.patch
 
 # Debian patches
 disableopengltests.patch
diff --git a/debian/patches/use_delay_properly_in_mousewheel.patch b/debian/patches/use_delay_properly_in_mousewheel.patch
deleted file mode 100644
index 1c1c7cf..0000000
--- a/debian/patches/use_delay_properly_in_mousewheel.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: QtTest: use delay properly in mouseWheel()
-Origin: upstream, https://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=a7579771e35bfd73
-Last-Update: 2022-05-23
-
---- a/src/imports/testlib/quicktestevent.cpp
-+++ b/src/imports/testlib/quicktestevent.cpp
-@@ -231,8 +231,10 @@ namespace QtQuickTest
-         QTEST_ASSERT(item);
-         if (delay == -1 || delay < QTest::defaultMouseDelay())
-             delay = QTest::defaultMouseDelay();
--        if (delay > 0)
-+        if (delay > 0) {
-             QTest::qWait(delay);
-+            lastMouseTimestamp += delay;
-+        }
- 
-         QPoint pos;
-         QQuickItem *sgitem = qobject_cast<QQuickItem *>(item);
-@@ -245,6 +247,7 @@ namespace QtQuickTest
-         stateKey &= static_cast<unsigned int>(Qt::KeyboardModifierMask);
-         QWheelEvent we(pos, window->mapToGlobal(pos), QPoint(0, 0), QPoint(xDelta, yDelta), buttons,
-                        stateKey, Qt::NoScrollPhase, false);
-+        we.setTimestamp(++lastMouseTimestamp);
- 
-         QSpontaneKeyEvent::setSpontaneous(&we); // hmmmm
-         if (!qApp->notify(window, &we))
---- a/tests/auto/qmltest/events/tst_wheel.qml
-+++ b/tests/auto/qmltest/events/tst_wheel.qml
-@@ -64,7 +64,7 @@ Rectangle {
-             verify(flick.contentX == 0);
-             flick.contentY = 0;
-             verify(flick.contentY == 0);
--            mouseWheel(flick, 200, 200, -120, 0, Qt.NoButton, Qt.NoModifier, -1);
-+            mouseWheel(flick, 200, 200, -120, 0, Qt.NoButton, Qt.NoModifier, 100);
-             wait(1000);
-             verify(flick.contentX > 0);
-             verify(flick.contentY == 0);


More information about the Neon-commits mailing list