diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-11-27 06:27:41 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-11-27 06:28:22 +0100 |
| commit | 2fc12794c267e9666179e2c96d9a7b56801a11cf (patch) | |
| tree | 7050573d51955f16af2db89f9622eeaa05fd6570 /src | |
| parent | 03b6a1cee4fe7f38ca16c0bc2d08d8d4d1288f2f (diff) | |
| parent | 871ac375bd1611e1f158d8e96e26227b56f87d37 (diff) | |
Merge pull request #3319
871ac37 qt: restore icon dock menu (theuni)
Diffstat (limited to 'src')
| -rw-r--r-- | src/qt/macdockiconhandler.mm | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/qt/macdockiconhandler.mm b/src/qt/macdockiconhandler.mm index 8f826941b2..86b8c834d4 100644 --- a/src/qt/macdockiconhandler.mm +++ b/src/qt/macdockiconhandler.mm @@ -8,6 +8,10 @@ #undef slots #include <Cocoa/Cocoa.h> +#if QT_VERSION < 0x050000 +extern void qt_mac_set_dock_menu(QMenu *); +#endif + @interface DockIconClickEventHandler : NSObject { MacDockIconHandler* dockIconHandler; @@ -52,7 +56,9 @@ MacDockIconHandler::MacDockIconHandler() : QObject() this->m_dummyWidget = new QWidget(); this->m_dockMenu = new QMenu(this->m_dummyWidget); this->setMainWindow(NULL); - +#if QT_VERSION < 0x050000 + qt_mac_set_dock_menu(this->m_dockMenu); +#endif [pool release]; } |