diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-04-15 00:52:24 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-04-15 00:52:24 (GMT) |
| commit | 83cdc9150311e30d8a77e69f7546b88e1eb1bdc3 (patch) | |
| tree | 5270d085b55ab6994f107e4865e06b3c3d63f0e9 /src/gui/kernel/qcursor_mac.mm | |
| parent | 014af3e99616f9ee13ca365566828f7daf77a7f6 (diff) | |
| parent | bb7bddc47dd0748b45d22180d9e3c8e5209010b3 (diff) | |
| download | Qt-83cdc9150311e30d8a77e69f7546b88e1eb1bdc3.zip Qt-83cdc9150311e30d8a77e69f7546b88e1eb1bdc3.tar.gz Qt-83cdc9150311e30d8a77e69f7546b88e1eb1bdc3.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'src/gui/kernel/qcursor_mac.mm')
| -rw-r--r-- | src/gui/kernel/qcursor_mac.mm | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/gui/kernel/qcursor_mac.mm b/src/gui/kernel/qcursor_mac.mm index d632eb79..ae98f2e 100644 --- a/src/gui/kernel/qcursor_mac.mm +++ b/src/gui/kernel/qcursor_mac.mm @@ -95,9 +95,19 @@ protected: } }; +void *nsCursorForQCursor(const QCursor &c) +{ + c.d->update(); + return [[static_cast<NSCursor *>(c.d->curs.cp.nscursor) retain] autorelease]; +} + static QCursorData *currentCursor = 0; //current cursor void qt_mac_set_cursor(const QCursor *c, const QPoint &) { +#ifdef QT_MAC_USE_COCOA + Q_UNUSED(c); + return; +#else if (!c) { currentCursor = 0; return; @@ -128,10 +138,15 @@ void qt_mac_set_cursor(const QCursor *c, const QPoint &) } } currentCursor = c->d; +#endif } void qt_mac_update_cursor_at_global_pos(const QPoint &globalPos) { +#ifdef QT_MAC_USE_COCOA + Q_UNUSED(globalPos); + return; +#else QCursor cursor(Qt::ArrowCursor); if (QApplication::overrideCursor()) { cursor = *QApplication::overrideCursor(); @@ -144,6 +159,7 @@ void qt_mac_update_cursor_at_global_pos(const QPoint &globalPos) } } qt_mac_set_cursor(&cursor, globalPos); +#endif } void qt_mac_update_cursor() |