Merge pull request #4252
c21c74b
osx: Fix missing dock menu with qt5 (Cory Fields)
This commit is contained in:
commit
97ab93f50b
1 changed files with 2 additions and 0 deletions
|
@ -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…
Add table
Reference in a new issue