casa-mp-base

--- src/gui/kernel/qcursor_mac.mm.orig

+++ src/gui/kernel/qcursor_mac.mm

@@ -367,7 +367,7 @@

     type = QCursorData::TYPE_ImageCursor;

     curs.cp.my_cursor = true;

     QPixmap bmCopy = QPixmap::fromImage(finalCursor);

-    NSPoint hotSpot = { hx, hy };

+    NSPoint hotSpot = { (CGFloat) hx, (CGFloat) hy };

     nsimage = static_cast<NSImage*>(qt_mac_create_nsimage(bmCopy));

     curs.cp.nscursor = [[NSCursor alloc] initWithImage:nsimage hotSpot: hotSpot];

     [nsimage release];

@@ -377,7 +377,7 @@

 {

     type = QCursorData::TYPE_ImageCursor;

     curs.cp.my_cursor = true;

-    NSPoint hotSpot = { hx, hy };

+    NSPoint hotSpot = { (CGFloat) hx, (CGFloat) hy };

     NSImage *nsimage;

     nsimage = static_cast<NSImage *>(qt_mac_create_nsimage(pixmap));

     curs.cp.nscursor = [[NSCursor alloc] initWithImage:nsimage hotSpot: hotSpot];

--- src/gui/kernel/qcocoaview_mac.mm.orig

+++ src/gui/kernel/qcocoaview_mac.mm

@@ -1352,7 +1352,7 @@

     // Save supported actions:

     [theView setSupportedActions: qt_mac_mapDropActions(dragPrivate()->possible_actions)];

     QPoint pointInView = [theView qt_qwidget]->mapFromGlobal(dndParams->globalPoint);

-    NSPoint imageLoc = {pointInView.x() - hotspot.x(), pointInView.y() + pix.height() - hotspot.y()};

+    NSPoint imageLoc = {(CGFloat)(pointInView.x() - hotspot.x()), (CGFloat)(pointInView.y() + pix.height() - hotspot.y())};

     NSSize mouseOffset = {0.0, 0.0};

     NSPasteboard *pboard = [NSPasteboard pasteboardWithName:NSDragPboard];

     dragPrivate()->executed_action = Qt::ActionMask;

--- src/gui/kernel/qt_cocoa_helpers_mac.mm.orig

+++ src/gui/kernel/qt_cocoa_helpers_mac.mm

@@ -459,17 +459,17 @@

 {

     NSEvent *proximityEvent = static_cast<NSEvent *>(tabletEvent);

     // simply construct a Carbon proximity record and handle it all in one spot.

-    TabletProximityRec carbonProximityRec = { [proximityEvent vendorID],

-                                              [proximityEvent tabletID],

-                                              [proximityEvent pointingDeviceID],

-                                              [proximityEvent deviceID],

-                                              [proximityEvent systemTabletID],

-                                              [proximityEvent vendorPointingDeviceType],

-                                              [proximityEvent pointingDeviceSerialNumber],

+    TabletProximityRec carbonProximityRec = {(UInt16) [proximityEvent vendorID],

+                                              (UInt16) [proximityEvent tabletID],

+                                              (UInt16) [proximityEvent pointingDeviceID],

+                                              (UInt16) [proximityEvent deviceID],

+                                              (UInt16) [proximityEvent systemTabletID],

+                                              (UInt16) [proximityEvent vendorPointingDeviceType],

+                                              (UInt32) [proximityEvent pointingDeviceSerialNumber],

                                               [proximityEvent uniqueID],

-                                              [proximityEvent capabilityMask],

-                                              [proximityEvent pointingDeviceType],

-                                              [proximityEvent isEnteringProximity] };

+                                              (UInt32) [proximityEvent capabilityMask],

+                         (UInt8) [proximityEvent pointingDeviceType],

+                         (UInt8) [proximityEvent isEnteringProximity] };

     qt_dispatchTabletProximityEvent(carbonProximityRec);

 }

 #endif // QT_MAC_USE_COCOA

--- src/gui/accessible/qaccessible_mac.mm.orig

+++ src/gui/accessible/qaccessible_mac.mm