Browse Source

osx: Fix missing dock menu with qt5

Qt5 Removed the qt_mac_set_dock_menu function and left no replacement. It was
later re-added and deprecated for backwards-compatibility.

Qt5.2 adds the non-deprecated QMenu::setAsDockMenu(). Use that when possible.
0.10
Cory Fields 11 years ago
parent
commit
c21c74bec4
  1. 2
      src/qt/macdockiconhandler.mm

2
src/qt/macdockiconhandler.mm

@ -62,6 +62,8 @@ MacDockIconHandler::MacDockIconHandler() : QObject()
this->setMainWindow(NULL); this->setMainWindow(NULL);
#if QT_VERSION < 0x050000 #if QT_VERSION < 0x050000
qt_mac_set_dock_menu(this->m_dockMenu); qt_mac_set_dock_menu(this->m_dockMenu);
#elif QT_VERSION >= 0x050200
this->m_dockMenu->setAsDockMenu();
#endif #endif
[pool release]; [pool release];
} }

Loading…
Cancel
Save