Changeset 59101 in vbox

Timestamp:

Dec 11, 2015 4:26:22 PM (9 years ago)

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• platform/darwin/VBoxUtils-darwin-cocoa.mm (modified) (2 diffs)
• platform/darwin/VBoxUtils-darwin.h (modified) (1 diff)
• runtime/UIMachineLogic.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxUtils-darwin-cocoa.mm

@@ -293 +293 @@
 }
 
+#if QT_VERSION < 0x050000
 void darwinSetDockIconMenu(QMenu* pMenu)
 {
@@ -298 +299 @@
     qt_mac_set_dock_menu(pMenu);
 }
+#endif /* QT_VERSION < 0x050000 */
 
 /**

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

@@ -254 +254 @@
 void darwinSetShowsWindowTransparent(QWidget *pWidget, bool fEnabled);
 void darwinSetWindowHasShadow(QWidget *pWidget, bool fEnabled);
+#if QT_VERSION < 0x050000
 void darwinSetDockIconMenu(QMenu *pMenu);
+#endif /* QT_VERSION < 0x050000 */
 void darwinDisableIconsInMenus(void);
 

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

@@ -1229 +1229 @@
     pDockMenu->addMenu(pDockSettingsMenu);
 
+# if QT_VERSION < 0x050000
     /* Add it to the dock. */
     ::darwinSetDockIconMenu(pDockMenu);
+# else /* QT_VERSION >= 0x050000 */
+    /* Add it to the dock: */
+    pDockMenu->setAsDockMenu();
+# endif /* QT_VERSION >= 0x050000 */
 
     /* Now the dock icon preview */