4 files changed, 61 insertions, 0 deletions
diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm
index 9b581c5..bcbd1bf 100644
--- a/src/gui/kernel/qcocoaview_mac.mm
+++ b/src/gui/kernel/qcocoaview_mac.mm
@@ -181,6 +181,7 @@ QT_FORWARD_DECLARE_CLASS(QAbstractScrollAreaPrivate)
 QT_FORWARD_DECLARE_CLASS(QPaintEvent)
 QT_FORWARD_DECLARE_CLASS(QPainter)
 QT_FORWARD_DECLARE_CLASS(QHoverEvent)
+QT_FORWARD_DECLARE_CLASS(QCursor)
 QT_USE_NAMESPACE
 extern "C" {
     extern NSString *NSTextInputReplacementRangeAttributeName;
@@ -236,6 +237,34 @@ extern "C" {
     }
 }
 
+- (void)resetCursorRects
+{
+    QWidget *cursorWidget = qwidget;
+
+    if (cursorWidget->testAttribute(Qt::WA_TransparentForMouseEvents))
+        cursorWidget = QApplication::widgetAt(qwidget->mapToGlobal(qwidget->rect().center()));
+
+    if (cursorWidget == 0)
+        return;
+
+    if (!cursorWidget->testAttribute(Qt::WA_SetCursor)) {
+        [super resetCursorRects];
+        return;
+    }
+
+    QRegion mask = qt_widget_private(cursorWidget)->extra->mask;
+    NSCursor *nscursor = static_cast<NSCursor *>(nsCursorForQCursor(cursorWidget->cursor()));
+    if (mask.isEmpty()) {
+        [self addCursorRect:[qt_mac_nativeview_for(cursorWidget) visibleRect] cursor:nscursor];
+    } else {
+        const QVector<QRect> &rects = mask.rects();
+        for (int i = 0; i < rects.size(); ++i) {
+            const QRect &rect = rects.at(i);
+            [self addCursorRect:NSMakeRect(rect.x(), rect.y(), rect.width(), rect.height()) cursor:nscursor];
+        }
+    }
+}
+
 - (void)removeDropData
 {
     if (dropData) {
diff --git a/src/gui/kernel/qcursor.h b/src/gui/kernel/qcursor.h
index 15b4597..ad1860d 100644
--- a/src/gui/kernel/qcursor.h
+++ b/src/gui/kernel/qcursor.h
@@ -77,6 +77,7 @@ class QBitmap;
 class QPixmap;
 
 #if defined(Q_WS_MAC)
+void *nsCursorForQCursor(const QCursor &c);
 void qt_mac_set_cursor(const QCursor *c, const QPoint &p);
 #endif
 
@@ -128,6 +129,7 @@ public:
 private:
     QCursorData *d;
 #if defined(Q_WS_MAC)
+    friend void *nsCursorForQCursor(const QCursor &c);
     friend void qt_mac_set_cursor(const QCursor *c, const QPoint &p);
 #endif
 };
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()
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm
index e7dfde5..827e098 100644
--- a/src/gui/kernel/qwidget_mac.mm
+++ b/src/gui/kernel/qwidget_mac.mm
@@ -2847,12 +2847,26 @@ void QWidgetPrivate::updateSystemBackground()
 
 void QWidgetPrivate::setCursor_sys(const QCursor &)
 {
+    Q_Q(QWidget);
+#ifndef QT_MAC_USE_COCOA
     qt_mac_update_cursor();
+#else
+    if (q->testAttribute(Qt::WA_WState_Created)) {
+        [qt_mac_window_for(q) invalidateCursorRectsForView:qt_mac_nativeview_for(q)];
+    }
+#endif
 }
 
 void QWidgetPrivate::unsetCursor_sys()
 {
+    Q_Q(QWidget);
+#ifndef QT_MAC_USE_COCOA
     qt_mac_update_cursor();
+#else
+    if (q->testAttribute(Qt::WA_WState_Created)) {
+        [qt_mac_window_for(q) invalidateCursorRectsForView:qt_mac_nativeview_for(q)];
+    }
+#endif
 }
 
 void QWidgetPrivate::setWindowTitle_sys(const QString &caption)