Changeset 58852 in vbox

Timestamp:

Nov 25, 2015 1:12:33 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Qt5 migration (part 5): Touch-screen events notation changes in QGraphicsView.

File:

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

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

@@ -52 +52 @@
             AssertPtrReturn(pTouchEvent, QGraphicsView::event(pEvent));
             /* For touch-screen event we have something special: */
+#if QT_VERSION >= 0x050000
+            if (pTouchEvent->device()->type() == QTouchDevice::TouchScreen)
+#else /* QT_VERSION < 0x050000 */
             if (pTouchEvent->deviceType() == QTouchEvent::TouchScreen)
+#endif /* QT_VERSION < 0x050000 */
             {
                 /* Remember where the scrolling was started: */
@@ -69 +73 @@
             AssertPtrReturn(pTouchEvent, QGraphicsView::event(pEvent));
             /* For touch-screen event we have something special: */
+#if QT_VERSION >= 0x050000
+            if (pTouchEvent->device()->type() == QTouchDevice::TouchScreen)
+#else /* QT_VERSION < 0x050000 */
             if (pTouchEvent->deviceType() == QTouchEvent::TouchScreen)
+#endif /* QT_VERSION < 0x050000 */
             {
                 /* Determine vertical shift (inverted): */
@@ -92 +100 @@
             AssertPtrReturn(pTouchEvent, QGraphicsView::event(pEvent));
             /* For touch-screen event we have something special: */
+#if QT_VERSION >= 0x050000
+            if (pTouchEvent->device()->type() == QTouchDevice::TouchScreen)
+#else /* QT_VERSION < 0x050000 */
             if (pTouchEvent->deviceType() == QTouchEvent::TouchScreen)
+#endif /* QT_VERSION < 0x050000 */
             {
                 /* Reset the scrolling start position: */