diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2010-02-01 02:17:47 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2010-02-01 02:17:47 (GMT) |
| commit | 3733ee3ca9fdc964f2453089ca18c9179839846e (patch) | |
| tree | 95cb7a51eb51f612611f48b44a51c23bcd0f8727 /src/gui/kernel/qapplication_p.h | |
| parent | a16a6e6fb3cf9d9c70515d2361bc06c598c27f3f (diff) | |
| parent | 8a2f4988afa8af09e4e8ed39d76c8eac0ba30390 (diff) | |
| download | Qt-3733ee3ca9fdc964f2453089ca18c9179839846e.zip Qt-3733ee3ca9fdc964f2453089ca18c9179839846e.tar.gz Qt-3733ee3ca9fdc964f2453089ca18c9179839846e.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2
Diffstat (limited to 'src/gui/kernel/qapplication_p.h')
| -rw-r--r-- | src/gui/kernel/qapplication_p.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h index a796048..59565d4 100644 --- a/src/gui/kernel/qapplication_p.h +++ b/src/gui/kernel/qapplication_p.h @@ -458,7 +458,10 @@ public: 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 |