diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-05-30 10:19:02 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-05-30 10:20:11 +0200 |
| commit | 97ab93f50b6f35bc362990e9dd665b90ca4132df (patch) | |
| tree | 21df02a4f80cf860abac0fe0e1af3da7c0fdbb96 /src | |
| parent | b73dc953a8210371d66cf441a1949d84582e2c5e (diff) | |
| parent | c21c74bec43a693283fecbdfb62fee4523317a81 (diff) | |
Merge pull request #4252
c21c74b osx: Fix missing dock menu with qt5 (Cory Fields)
Diffstat (limited to 'src')
| -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]; } |