Changeset 58860 in vbox

Timestamp:

Nov 25, 2015 2:03:49 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Qt5 migration (part 12): QRect API changes.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxFBOverlay.cpp (modified) (1 diff)
• runtime/UIMachineView.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp

@@ -3666 +3666 @@
     const OverlayList & overlays = mDisplay.overlays();
     QRect overInter = overlaysRectIntersection();
+#if QT_VERSION >= 0x050000
+    overInter = overInter.intersected(aRect);
+#else /* QT_VERSION < 0x050000 */
     overInter = overInter.intersect(aRect);
+#endif /* QT_VERSION < 0x050000 */
 
     bool bDisplayPrimary = true;

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

@@ -1443 +1443 @@
     {
         /* We have a snapshot for the paused state: */
+#if QT_VERSION >= 0x050000
+        QRect rect = pPaintEvent->rect().intersected(viewport()->rect());
+#else /* QT_VERSION < 0x050000 */
         QRect rect = pPaintEvent->rect().intersect(viewport()->rect());
+#endif /* QT_VERSION < 0x050000 */
         QPainter painter(viewport());
         /* Take the scale-factor into account: */