Changeset 59106 in vbox for trunk/src/VBox

Timestamp:

Dec 11, 2015 4:36:55 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Qt5 migration (part 45): QPixmap API changes for Mac OS X.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxUtils-darwin.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxUtils-darwin.cpp

@@ -30 +30 @@
 #include <QPixmap>
 #include <QContextMenuEvent>
+#if QT_VERSION >= 0x050000
+# include <QtMac>
+#endif /* QT_VERSION >= 0x050000 */
 
 #include <Carbon/Carbon.h>
@@ -326 +329 @@
                                               kCGImageAlphaPremultipliedFirst);
     /* Get the CGImageRef from Qt */
+#if QT_VERSION < 0x050000
     CGImageRef qtPixmap = pPixmap->toMacCGImageRef();
+#else /* QT_VERSION >= 0x050000 */
+    CGImageRef qtPixmap = QtMac::toCGImageRef(*pPixmap);
+#endif /* QT_VERSION >= 0x050000 */
     /* Draw the image from Qt & convert the context back to a new CGImageRef. */
     CGContextDrawImage(ctx, CGRectMake(0, 0, pPixmap->width(), pPixmap->height()), qtPixmap);