aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortheuni <theuni-nospam@xbmc.org>2013-11-26 19:10:41 -0500
committertheuni <theuni-nospam@xbmc.org>2013-11-26 19:13:07 -0500
commit871ac375bd1611e1f158d8e96e26227b56f87d37 (patch)
tree7050573d51955f16af2db89f9622eeaa05fd6570 /src
parent03b6a1cee4fe7f38ca16c0bc2d08d8d4d1288f2f (diff)
qt: restore icon dock menu
This was removed by 25c0cce7f. It was apparently removed in qt5, but may return for 5.1.
Diffstat (limited to 'src')
-rw-r--r--src/qt/macdockiconhandler.mm8
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];
}