Changeset 100034 in vbox

Timestamp:

Jun 1, 2023 11:20:25 AM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

157712

Message:

FE/Qt: bugref:10450: Runtime UI: More remaining bits fixing Qt6 compatibility for UIMouseHandler, s.a. r157476.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.cpp

@@ -1213 +1213 @@
     /* Pass all multi-touch events into guest: */
     int iTouchPointIndex = 0;
+#ifdef VBOX_IS_QT6_OR_LATER /* QTouchEvent::TouchPoint was replaced by QEventPoint in 6.0 */
+    foreach (const QEventPoint &touchPoint, pTouchEvent->points())
+#else
     foreach (const QTouchEvent::TouchPoint &touchPoint, pTouchEvent->touchPoints())
+#endif
     {
         /* Get touch-point state: */
@@ -1219 +1223 @@
         switch (touchPoint.state())
         {
+#ifdef VBOX_IS_QT6_OR_LATER /* QTouchEvent::TouchPoint was replaced by QEventPoint in 6.0 */
+            case QEventPoint::Pressed:
+            case QEventPoint::Updated:
+            case QEventPoint::Stationary:
+#else
             case Qt::TouchPointPressed:
             case Qt::TouchPointMoved:
             case Qt::TouchPointStationary:
+#endif
                 iTouchPointState = KTouchContactState_InContact;
                 if (fTouchScreen)