Changeset 94025 in vbox

Timestamp:

Mar 1, 2022 10:50:43 AM (3 years ago)

Author:

vboxsync

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

150258

Message:

FE/Qt: qt6: QTouchDevice::TouchScreen -> QInputDevice::DeviceType::TouchScreen (QInputDevice is new qt6, it seems). bugref:9898

File:

• trunk/src/VBox/Frontends/VirtualBox/src/extensions/graphics/QIGraphicsView.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/graphics/QIGraphicsView.cpp

@@ -47 +47 @@
             AssertPtrReturn(pTouchEvent, QGraphicsView::event(pEvent));
             /* For touch-screen event we have something special: */
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+            if (pTouchEvent->device()->type() == QInputDevice::DeviceType::TouchScreen)
+#else
             if (pTouchEvent->device()->type() == QTouchDevice::TouchScreen)
+#endif
             {
                 /* Remember where the scrolling was started: */
@@ -64 +68 @@
             AssertPtrReturn(pTouchEvent, QGraphicsView::event(pEvent));
             /* For touch-screen event we have something special: */
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+            if (pTouchEvent->device()->type() == QInputDevice::DeviceType::TouchScreen)
+#else
             if (pTouchEvent->device()->type() == QTouchDevice::TouchScreen)
+#endif
             {
                 /* Determine vertical shift (inverted): */
@@ -87 +95 @@
             AssertPtrReturn(pTouchEvent, QGraphicsView::event(pEvent));
             /* For touch-screen event we have something special: */
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+            if (pTouchEvent->device()->type() == QInputDevice::DeviceType::TouchScreen)
+#else
             if (pTouchEvent->device()->type() == QTouchDevice::TouchScreen)
+#endif
             {
                 /* Reset the scrolling start position: */