Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake

Change-Id: I3a1d7673c3c20019ab12a2ea0a60f1619920a34c

1 files changed, 6 insertions, 5 deletions

diff --git a/examples/widgets/widgets/mousebuttons/buttontester.cpp b/examples/widgets/widgets/mousebuttons/buttontester.cpp
index 6653221698..88dbbeda45 100644
--- a/examples/widgets/widgets/mousebuttons/buttontester.cpp
+++ b/examples/widgets/widgets/mousebuttons/buttontester.cpp
@@ -93,15 +93,16 @@ void ButtonTester::mouseDoubleClickEvent(QMouseEvent *e)
 void ButtonTester::wheelEvent (QWheelEvent *e)
 {
     QString result;
-    if (e->delta() > 0) {
-
-        if (e->orientation() == Qt::Vertical) {
+    const bool vertical = qAbs(e->angleDelta().y()) >= qAbs(e->angleDelta().x());
+    const int delta = vertical ? e->angleDelta().y() : e->angleDelta().x();
+    if (delta > 0) {
+        if (vertical) {
             result = "Mouse Wheel Event: UP";
         } else {
             result = "Mouse Wheel Event: LEFT";
         }
-    } else if (e->delta() < 0) {
-        if (e->orientation() == Qt::Vertical) {
+    } else if (delta < 0) {
+        if (vertical) {
             result = "Mouse Wheel Event: DOWN";
         } else {
             result = "Mouse Wheel Event: RIGHT";