1 files changed, 44 insertions, 35 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoacursor.mm b/src/plugins/platforms/cocoa/qcocoacursor.mm
index e5b41e7a88..13f6423701 100644
--- a/src/plugins/platforms/cocoa/qcocoacursor.mm
+++ b/src/plugins/platforms/cocoa/qcocoacursor.mm
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include "qcocoacursor.h"
+#include "qcocoawindow.h"
 #include "qcocoahelpers.h"
 #include "qcocoaautoreleasepool.h"
 
@@ -63,82 +64,90 @@ QCocoaCursor::~QCocoaCursor()
 
 void QCocoaCursor::changeCursor(QCursor *cursor, QWindow *window)
 {
-    Q_UNUSED(window);
+    NSCursor * cocoaCursor = convertCursor(cursor);
 
+    if (QPlatformWindow * platformWindow = window->handle())
+        static_cast<QCocoaWindow *>(platformWindow)->setWindowCursor(cocoaCursor);
+}
+
+QPoint QCocoaCursor::pos() const
+{
+    return qt_mac_flipPoint([NSEvent mouseLocation]).toPoint();
+}
+
+void QCocoaCursor::setPos(const QPoint &position)
+{
+    CGPoint pos;
+    pos.x = position.x();
+    pos.y = position.y();
+
+    CGEventRef e = CGEventCreateMouseEvent(0, kCGEventMouseMoved, pos, 0);
+    CGEventPost(kCGHIDEventTap, e);
+    CFRelease(e);
+}
+
+NSCursor *QCocoaCursor::convertCursor(QCursor * cursor)
+{
     const Qt::CursorShape newShape = cursor ? cursor->shape() : Qt::ArrowCursor;
+    NSCursor *cocoaCursor;
+
     // Check for a suitable built-in NSCursor first:
     switch (newShape) {
     case Qt::ArrowCursor:
-        [[NSCursor arrowCursor] set];
+        cocoaCursor= [NSCursor arrowCursor];
         break;
     case Qt::CrossCursor:
-        [[NSCursor crosshairCursor] set];
+        cocoaCursor = [NSCursor crosshairCursor];
         break;
     case Qt::IBeamCursor:
-        [[NSCursor IBeamCursor] set];
+        cocoaCursor = [NSCursor IBeamCursor];
         break;
     case Qt::WhatsThisCursor: //for now just use the pointing hand
     case Qt::PointingHandCursor:
-        [[NSCursor pointingHandCursor] set];
+        cocoaCursor = [NSCursor pointingHandCursor];
         break;
     case Qt::SplitVCursor:
-        [[NSCursor resizeUpDownCursor] set];
+        cocoaCursor = [NSCursor resizeUpDownCursor];
         break;
     case Qt::SplitHCursor:
-        [[NSCursor resizeLeftRightCursor] set];
+        cocoaCursor = [NSCursor resizeLeftRightCursor];
         break;
     case Qt::OpenHandCursor:
-        [[NSCursor openHandCursor] set];
+        cocoaCursor = [NSCursor openHandCursor];
         break;
     case Qt::ClosedHandCursor:
-        [[NSCursor closedHandCursor] set];
+        cocoaCursor = [NSCursor closedHandCursor];
         break;
     case Qt::DragMoveCursor:
-        [[NSCursor crosshairCursor] set];
+        cocoaCursor = [NSCursor crosshairCursor];
         break;
     case Qt::DragCopyCursor:
-        [[NSCursor crosshairCursor] set];
+        cocoaCursor = [NSCursor crosshairCursor];
         break;
     case Qt::DragLinkCursor:
-        [[NSCursor dragLinkCursor] set];
+        cocoaCursor = [NSCursor dragLinkCursor];
         break;
     default : {
         // No suitable OS cursor exist, use cursors provided
         // by Qt for the rest. Check for a cached cursor:
-        NSCursor *cocoaCursor = m_cursors.value(newShape);
+        cocoaCursor = m_cursors.value(newShape);
         if (cocoaCursor && cursor->shape() == Qt::BitmapCursor) {
             [cocoaCursor release];
             cocoaCursor = 0;
         }
         if (cocoaCursor == 0) {
             cocoaCursor = createCursorData(cursor);
-            if (cocoaCursor == 0) {
-                [[NSCursor arrowCursor] set];
-                return;
-            }
+            if (cocoaCursor == 0)
+                return [NSCursor arrowCursor];
+
             m_cursors.insert(newShape, cocoaCursor);
         }
 
-        [cocoaCursor set];
         break; }
     }
+    return cocoaCursor;
 }
 
-QPoint QCocoaCursor::pos() const
-{
-    return qt_mac_flipPoint([NSEvent mouseLocation]).toPoint();
-}
-
-void QCocoaCursor::setPos(const QPoint &position)
-{
-    CGPoint pos;
-    pos.x = position.x();
-    pos.y = position.y();
-
-    CGEventRef e = CGEventCreateMouseEvent(0, kCGEventMouseMoved, pos, 0);
-    CGEventPost(kCGHIDEventTap, e);
-    CFRelease(e);
-}
 
 // Creates an NSCursor for the given QCursor.
 NSCursor *QCocoaCursor::createCursorData(QCursor *cursor)
@@ -218,8 +227,8 @@ NSCursor *QCocoaCursor::createCursorData(QCursor *cursor)
         return createCursorFromPixmap(pixmap, hotspot);
         break; }
     case Qt::SizeAllCursor: {
-        QPixmap pixmap = QPixmap(QLatin1String(":/qt-project.org/mac/cursors/images/pluscursor.png"));
-        return createCursorFromPixmap(pixmap, hotspot);
+        QPixmap pixmap = QPixmap(QLatin1String(":/qt-project.org/mac/cursors/images/sizeallcursor.png"));
+        return createCursorFromPixmap(pixmap, QPoint(8, 8));
         break; }
     case Qt::BusyCursor: {
         QPixmap pixmap = QPixmap(QLatin1String(":/qt-project.org/mac/cursors/images/waitcursor.png"));