Merge pull request #1875 from hsoft/master

Fix compilation with clang under OS X
This commit is contained in:
Wladimir J. van der Laan 2012-09-29 02:23:46 -07:00
commit 018ec85ff7

View file

@ -6,7 +6,12 @@
class QMenu; class QMenu;
class QIcon; class QIcon;
class QWidget; class QWidget;
class objc_object;
#ifdef __OBJC__
@class DockIconClickEventHandler;
#else
class DockIconClickEventHandler;
#endif
/** Macintosh-specific dock icon handler. /** Macintosh-specific dock icon handler.
*/ */
@ -31,7 +36,7 @@ public slots:
private: private:
MacDockIconHandler(); MacDockIconHandler();
objc_object *m_dockIconClickEventHandler; DockIconClickEventHandler *m_dockIconClickEventHandler;
QWidget *m_dummyWidget; QWidget *m_dummyWidget;
QMenu *m_dockMenu; QMenu *m_dockMenu;
}; };