From f6c17c37ba4e588a8c9a579cfbfb40709fe7cf0e Mon Sep 17 00:00:00 2001
From: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
Date: Mon, 30 Jan 2017 17:06:35 -0800
Subject: [PATCH] QCursor: Remove old pixmaps and use native cursor on macOS

The DragCopyCursor part is a regression from ed55c4a14c9e8b70b3947c.

Change-Id: Id98a40c372e48f09d8c1824a4c2c1df2a3bdd052
Task-number: QTBUG-58378
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
---
 .../platforms/cocoa/images/copyarrowcursor.png   | Bin 1976 -> 0 bytes
 .../platforms/cocoa/images/forbiddencursor.png   | Bin 1745 -> 0 bytes
 src/plugins/platforms/cocoa/qcocoacursor.mm      |   9 ++++-----
 src/plugins/platforms/cocoa/qcocoaresources.qrc  |  14 ++++++--------
 4 files changed, 10 insertions(+), 13 deletions(-)
 delete mode 100644 src/plugins/platforms/cocoa/images/copyarrowcursor.png
 delete mode 100644 src/plugins/platforms/cocoa/images/forbiddencursor.png

diff --git a/src/plugins/platforms/cocoa/images/copyarrowcursor.png b/src/plugins/platforms/cocoa/images/copyarrowcursor.png
deleted file mode 100644
index 13dfca95bcebbfcc6cce7e0c64bf2322e71b1a66..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1976
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
KMNUMnLSTZmt(bTK

diff --git a/src/plugins/platforms/cocoa/images/forbiddencursor.png b/src/plugins/platforms/cocoa/images/forbiddencursor.png
deleted file mode 100644
index a9f21b4a5eb5e144c76a6e7de7d1520687e3847d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1745
zcmV;?1}^!DP)<h;3K|Lk000e1NJLTq000>P001Ni1^@s6d<~Hh0006dX+uL$Nkc;*
zP;zf(X>4Tx0C=30l0j<|Q4q&}FF{gJgV?B0JnX@WLX;&z2qKa;*-F|Hmu#9Q@gT`=
znnaV$vf0Ecf(5}(Ac7t})E;_|H|x!d2T?TCFW}i?QKZDfx*HHeap1vkhIupd{_`OC
zvtn7T0MIraJ9lGVDwfJpXow)h2@+hb=v`}0RhOA)`=1d2A1_rbtM%g6_u;jtyX9X$
zHeNmIym>PD9spsxSSo{v0+G7QNgz^nIS)kcIhF&W0Yvmh#Q^aTh}!vF3d9x=uDkpi
z2v=Qx2ZZ~2-2pKKWYcJx5SRiIMy;zuAPF>#uHJ^g7KlK*-7z4z4P4MI+kxOG;9Rj(
zmfVro6L38X;_*0Ex&qrTVdnNYHrs?#voJ`HV|zmcAWlzp*Wxh%#L)p9c{UpDtwQJ`
z9DEs#eh)^YgG~tT!p^?lv-^Mb65>4^=DTlpefZ#bG>KhZ0FYr5DD1!@@EkaQ2ByD)
znuL6kKs@dpS3`G?1vMteWl2+V8AUr}>Hll(R?q8m5;$g7vp0bm;G5;Bd5^n&P4RfG
zxsdVLsHB%Xe$Yr|{TzEC=kcA&qUv$YT+#gcEp>U^Yu?YVbro$~Gr#Jw-OH_be7CdY
z=Nq-OKbzUg`Zb$Q#-E=8Dluf@$Vg}?<jA0)f%`83$~sJ+1$cYBu<@@}PHo)*NOi3H
zcC+4aq&drK)uK|y)GtS+m@Fsw1AAz&SnLh4wg3PC32;bRa{vGqB>(^xB>_oNB=7(L
z1X4*vK~zYIwU^OLTUQ*%Kldi-qHE`-)vjGwYbA5&gcY~oKx9zpOUo?uMfOsL5B>vt
z8B*B8*vlSUx;X}AZ-r5Yf)B=S;FIFUI_*@{sEalURx__IE}ACyw}<<?dK*pkA^pMO
z<eu}(_j7;e{LU{YKK9MjW>97`J$*n#@*>g&_&sxFGe1zZv$G>=*MJk{1Q|d8s1*@u
zYHAV@vC9oIRP0R=5#XhO4nST8=uk+xK_wyO1icVaF3^#Xa)6EnDFR)^N&910hmzUV
z*Vi{ABI{ZS#I|kG&ne*5<3{5@Y_O@RiK(fnI8ZPQ<C=mE?Xy5eUo5Z9*16+B6abJm
z4C8a40Qgii0GtF~(|%il+d$3(JYe4CvPI;Ph)e;Ofk-qOy&@vti^v}$vL+%qZEGU(
zyNKKsk&l2gI7=8P1#xSaEh0(a63`(c--yV(9Bp$V@-=W#qdXMk2VMs*c6WEb2egRD
zkA*_PItD;QMAY{Oph1_?=Zyj#s8G;p5xHsG_GhMPRsq<yEwNZ^ZDC;{F+M&X2WW3^
z57pP#ht8irU+eSveCoGpnr5G27`K6S-KV`hGId|hM5ECwwr$6X-*j?vauN6v=mtL3
z{)_(p{$G>H<htu;+jeYxeEc%-hBq45P5>7~<ep~<Y%eI2$xHxOf%kzH;A5bBXlN*!
z&*$?V*L%PP)!Z{v*YQ#=mwW7b&dkg_9UB{4E(+>5AOeJdb3iN5lSm|<xDL5o?y)A%
zNx*bZteas~wr#)Vk`sx<a$8&5gX!t%1<wn8AR>2gQnmm*1>%-v?fIxim1-K^vfu+M
z{C@u_cVKC0X$ttOxw-kfSS&X0@%>OlzSU?<z?z?*pK&Kuqr%-2FT|jz0)#@L46pz^
z3WvjYN`TG*zRJqVJkOh7H4hZHLN=S-b{`^<NCQsE_#61M1n4#pYHVzL*Bw-ig8S@3
zL<e`X+3c!284L#B!8yTMV6g<Kb#-<1RxlWB^gvdDUDXtCBspMfV`F1)ZG*w!+ahuk
zr~#e<abPkW4&R-dn~S-Ab#-;kH8nM7-DlO<Qq4Uxfglj>?Ck7GrBVqu9kbbNQp-gv
zPRVEiJ^^k`OiU~mAKFwZmFVp3>;b~6`P`NSfLfqqWMt&NWmy@|q0Ea@1b-5d-p$R;
zuj29e!{z1Wg!jN&mX#S98MzO1sMdi(Y2u_^18`$>bTsM(9c7kfWkyFwqreT-s3?xY
zH6P9)Y6iLn2L~UltgIxD0>tC-)WE>N&p?-cw~9mRmN%LJP_53_Bauk&@bK`%+1c5p
zbUMBDOf8*GZ_UomE)5M0{St{pdV%ZuoodzCi{h}`hRJ^EuLjQIob1y$>HLcN?c!w6
zI`9NY0sr8ndjU_0FLkAH{|p6yO5l_Ng6vm?Jg}pne}VsS(p)I|oj>Z{<idQ~ymu{8
n(So)E;>U$}VK1^n#a;U!CzhvSWh5y100000NkvXXu0mjf;PgA2

diff --git a/src/plugins/platforms/cocoa/qcocoacursor.mm b/src/plugins/platforms/cocoa/qcocoacursor.mm
index 3df2a7c962..99a136d384 100644
--- a/src/plugins/platforms/cocoa/qcocoacursor.mm
+++ b/src/plugins/platforms/cocoa/qcocoacursor.mm
@@ -97,6 +97,9 @@ NSCursor *QCocoaCursor::convertCursor(QCursor *cursor)
     case Qt::ArrowCursor:
         cocoaCursor= [NSCursor arrowCursor];
         break;
+    case Qt::ForbiddenCursor:
+        cocoaCursor = [NSCursor operationNotAllowedCursor];
+        break;
     case Qt::CrossCursor:
         cocoaCursor = [NSCursor crosshairCursor];
         break;
@@ -123,7 +126,7 @@ NSCursor *QCocoaCursor::convertCursor(QCursor *cursor)
         cocoaCursor = [NSCursor crosshairCursor];
         break;
     case Qt::DragCopyCursor:
-        cocoaCursor = [NSCursor crosshairCursor];
+        cocoaCursor = [NSCursor dragCopyCursor];
         break;
     case Qt::DragLinkCursor:
         cocoaCursor = [NSCursor dragLinkCursor];
@@ -235,10 +238,6 @@ NSCursor *QCocoaCursor::createCursorData(QCursor *cursor)
         QPixmap pixmap = QPixmap(QLatin1String(":/qt-project.org/mac/cursors/images/waitcursor.png"));
         return createCursorFromPixmap(pixmap, hotspot);
         break; }
-    case Qt::ForbiddenCursor: {
-        QPixmap pixmap = QPixmap(QLatin1String(":/qt-project.org/mac/cursors/images/forbiddencursor.png"));
-        return createCursorFromPixmap(pixmap, hotspot);
-        break; }
 #define QT_USE_APPROXIMATE_CURSORS
 #ifdef QT_USE_APPROXIMATE_CURSORS
     case Qt::SizeVerCursor:
diff --git a/src/plugins/platforms/cocoa/qcocoaresources.qrc b/src/plugins/platforms/cocoa/qcocoaresources.qrc
index b06ab65ea8..1c4b941b9b 100644
--- a/src/plugins/platforms/cocoa/qcocoaresources.qrc
+++ b/src/plugins/platforms/cocoa/qcocoaresources.qrc
@@ -1,9 +1,7 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource prefix="/qt-project.org/mac/cursors">
-<file>images/copyarrowcursor.png</file>
-<file>images/forbiddencursor.png</file>
-<file>images/spincursor.png</file>
-<file>images/waitcursor.png</file>
-<file>images/sizeallcursor.png</file>
-</qresource>
+<RCC>
+    <qresource prefix="/qt-project.org/mac/cursors">
+        <file>images/spincursor.png</file>
+        <file>images/waitcursor.png</file>
+        <file>images/sizeallcursor.png</file>
+    </qresource>
 </RCC>