aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCory Fields <cory-nospam-@coryfields.com>2014-05-29 15:30:46 -0400
committerCory Fields <cory-nospam-@coryfields.com>2014-05-29 15:32:24 -0400
commitc21c74bec43a693283fecbdfb62fee4523317a81 (patch)
treee6bf8fe481b701fc62275b6955be990490a2fc83
parent05b045b59dcd0796202407ecadf4e62c2741b522 (diff)
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.
-rw-r--r--src/qt/macdockiconhandler.mm2
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];
}