aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2014-05-30 10:19:02 +0200
committerWladimir J. van der Laan <[email protected]>2014-05-30 10:20:11 +0200
commit97ab93f50b6f35bc362990e9dd665b90ca4132df (patch)
tree21df02a4f80cf860abac0fe0e1af3da7c0fdbb96 /src
parentMerge pull request #4187 (diff)
parentosx: Fix missing dock menu with qt5 (diff)
downloaddiscoin-97ab93f50b6f35bc362990e9dd665b90ca4132df.tar.xz
discoin-97ab93f50b6f35bc362990e9dd665b90ca4132df.zip
Merge pull request #4252
c21c74b osx: Fix missing dock menu with qt5 (Cory Fields)
Diffstat (limited to 'src')
-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 64291c918..74fb64ace 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];
}