diff -r b72c6db6890b -r 5dc02b23752f src/gui/kernel/qapplication_p.h --- a/src/gui/kernel/qapplication_p.h Wed Jun 23 19:07:03 2010 +0300 +++ b/src/gui/kernel/qapplication_p.h Tue Jul 06 15:10:48 2010 +0300 @@ -459,6 +459,12 @@ static OSStatus globalEventProcessor(EventHandlerCallRef, EventRef, void *); static OSStatus globalAppleEventProcessor(const AppleEvent *, AppleEvent *, long); static OSStatus tabletProximityCallback(EventHandlerCallRef, EventRef, void *); +#ifdef QT_MAC_USE_COCOA + static void qt_initAfterNSAppStarted(); + static void setupAppleEvents(); + static void updateOverrideCursor(); + static void disableUsageOfCursorRects(bool disable); +#endif static bool qt_mac_apply_settings(); #endif @@ -508,12 +514,21 @@ int symbianResourceChange(const QSymbianEvent *symbianEvent); #endif -#if defined(Q_WS_WIN) || defined(Q_WS_X11) || defined (Q_WS_QWS) +#if defined(Q_WS_WIN) || defined(Q_WS_X11) || defined (Q_WS_QWS) || defined(Q_WS_MAC) void sendSyntheticEnterLeave(QWidget *widget); #endif QGestureManager *gestureManager; QWidget *gestureWidget; +#if defined(Q_WS_X11) || defined(Q_WS_WIN) + QPixmap *move_cursor; + QPixmap *copy_cursor; + QPixmap *link_cursor; +#endif +#if defined(Q_WS_WIN) + QPixmap *ignore_cursor; +#endif + QPixmap getPixmapCursor(Qt::CursorShape cshape); QMap > widgetForTouchPointId; QMap appCurrentTouchPoints; @@ -566,8 +581,7 @@ void _q_readRX71MultiTouchEvents(); #endif -#if defined(Q_OS_SYMBIAN) - int pressureSupported; +#if defined(Q_WS_S60) int maxTouchPressure; QList appAllTouchPoints; #endif