diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@qt.io> | 2017-01-30 17:06:35 -0800 |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dedietrich@qt.io> | 2017-01-31 18:34:12 +0000 |
| commit | f6c17c37ba4e588a8c9a579cfbfb40709fe7cf0e (patch) | |
| tree | 5b9a3afe19fb669f3337b56c07d110031a31f269 /src/plugins | |
| parent | fed6c35461e1b98af50e5f3c30aaacee45969472 (diff) | |
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>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/cocoa/images/copyarrowcursor.png | bin | 1976 -> 0 bytes | |||
| -rw-r--r-- | src/plugins/platforms/cocoa/images/forbiddencursor.png | bin | 1745 -> 0 bytes | |||
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoacursor.mm | 9 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaresources.qrc | 14 |
4 files changed, 10 insertions, 13 deletions
diff --git a/src/plugins/platforms/cocoa/images/copyarrowcursor.png b/src/plugins/platforms/cocoa/images/copyarrowcursor.png Binary files differdeleted file mode 100644 index 13dfca95bc..0000000000 --- a/src/plugins/platforms/cocoa/images/copyarrowcursor.png +++ /dev/null diff --git a/src/plugins/platforms/cocoa/images/forbiddencursor.png b/src/plugins/platforms/cocoa/images/forbiddencursor.png Binary files differdeleted file mode 100644 index a9f21b4a5e..0000000000 --- a/src/plugins/platforms/cocoa/images/forbiddencursor.png +++ /dev/null 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> |
