diff options
| author | Cory Fields <cory-nospam-@coryfields.com> | 2014-05-29 15:30:46 -0400 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-05-30 10:20:50 +0200 |
| commit | 3a4a66f47eea61ba262f915900eae97c35aa3a56 (patch) | |
| tree | 6ad2b9b0ff96e5d322e15e91a979f71003df8a8e | |
| parent | 2f89f4b35d2885110cb16a1f27bb4d8c10d17c07 (diff) | |
| download | bitcoin-3a4a66f47eea61ba262f915900eae97c35aa3a56.tar.xz | |
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.
Rebased-By: Wladimir J. van der Laan <laanwj@gmail.com>
Rebased-From: c21c74b
| -rw-r--r-- | src/qt/macdockiconhandler.mm | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qt/macdockiconhandler.mm b/src/qt/macdockiconhandler.mm index 64291c9188..74fb64ace3 100644 --- a/src/qt/macdockiconhandler.mm +++ b/src/qt/macdockiconhandler.mm @@ -62,6 +62,8 @@ MacDockIconHandler::MacDockIconHandler() : QObject() this->setMainWindow(NULL); #if QT_VERSION < 0x050000 qt_mac_set_dock_menu(this->m_dockMenu); +#elif QT_VERSION >= 0x050200 + this->m_dockMenu->setAsDockMenu(); #endif [pool release]; } |