From f6c17c37ba4e588a8c9a579cfbfb40709fe7cf0e Mon Sep 17 00:00:00 2001 From: Gabriel de Dietrich Date: Mon, 30 Jan 2017 17:06:35 -0800 Subject: 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 --- src/plugins/platforms/cocoa/images/copyarrowcursor.png | Bin 1976 -> 0 bytes src/plugins/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 13dfca95bc..0000000000 Binary files a/src/plugins/platforms/cocoa/images/copyarrowcursor.png and /dev/null differ diff --git a/src/plugins/platforms/cocoa/images/forbiddencursor.png b/src/plugins/platforms/cocoa/images/forbiddencursor.png deleted file mode 100644 index a9f21b4a5e..0000000000 Binary files a/src/plugins/platforms/cocoa/images/forbiddencursor.png and /dev/null differ 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 @@ - - -images/copyarrowcursor.png -images/forbiddencursor.png -images/spincursor.png -images/waitcursor.png -images/sizeallcursor.png - + + + images/spincursor.png + images/waitcursor.png + images/sizeallcursor.png + -- cgit v1.2.3