Merge pull request #3319

871ac37 qt: restore icon dock menu (theuni)
This commit is contained in:
Wladimir J. van der Laan 2013-11-27 06:27:41 +01:00
commit 2fc12794c2
No known key found for this signature in database
GPG key ID: 74810B012346C9A6

View file

@ -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];
}