Browse Source

Merge pull request #3319

871ac37 qt: restore icon dock menu (theuni)
0.10
Wladimir J. van der Laan 11 years ago
parent
commit
2fc12794c2
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
  1. 8
      src/qt/macdockiconhandler.mm

8
src/qt/macdockiconhandler.mm

@ -8,6 +8,10 @@
#undef slots #undef slots
#include <Cocoa/Cocoa.h> #include <Cocoa/Cocoa.h>
#if QT_VERSION < 0x050000
extern void qt_mac_set_dock_menu(QMenu *);
#endif
@interface DockIconClickEventHandler : NSObject @interface DockIconClickEventHandler : NSObject
{ {
MacDockIconHandler* dockIconHandler; MacDockIconHandler* dockIconHandler;
@ -52,7 +56,9 @@ MacDockIconHandler::MacDockIconHandler() : QObject()
this->m_dummyWidget = new QWidget(); this->m_dummyWidget = new QWidget();
this->m_dockMenu = new QMenu(this->m_dummyWidget); this->m_dockMenu = new QMenu(this->m_dummyWidget);
this->setMainWindow(NULL); this->setMainWindow(NULL);
#if QT_VERSION < 0x050000
qt_mac_set_dock_menu(this->m_dockMenu);
#endif
[pool release]; [pool release];
} }

Loading…
Cancel
Save