diff options
| -rw-r--r-- | src/client/qwaylandcursor.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/client/cursor/tst_cursor.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/client/qwaylandcursor.cpp b/src/client/qwaylandcursor.cpp index e7464ed8f..98d51a842 100644 --- a/src/client/qwaylandcursor.cpp +++ b/src/client/qwaylandcursor.cpp @@ -247,11 +247,11 @@ static QtWayland::wp_cursor_shape_device_v1::shape qtCursorShapeToWaylandShape(Q case Qt::SizeFDiagCursor: return wp_cursor_shape_device_v1::shape_nwse_resize; case Qt::WaitCursor: - return wp_cursor_shape_device_v1::shape_progress; + return wp_cursor_shape_device_v1::shape_wait; case Qt::SizeAllCursor: return wp_cursor_shape_device_v1::shape_all_scroll; case Qt::BusyCursor: - return wp_cursor_shape_device_v1::shape_wait; + return wp_cursor_shape_device_v1::shape_progress; case Qt::SplitVCursor: return wp_cursor_shape_device_v1::shape_row_resize; case Qt::ForbiddenCursor: diff --git a/tests/auto/client/cursor/tst_cursor.cpp b/tests/auto/client/cursor/tst_cursor.cpp index c86392b95..8681eff11 100644 --- a/tests/auto/client/cursor/tst_cursor.cpp +++ b/tests/auto/client/cursor/tst_cursor.cpp @@ -65,7 +65,7 @@ void tst_cursor::setCursor() QCOMPARE(setCursorShapeSpy.takeFirst().at(0).toUInt(), enterSerial); // client sets a different shape - window.setCursor(QCursor(Qt::BusyCursor)); + window.setCursor(QCursor(Qt::WaitCursor)); QVERIFY(setCursorShapeSpy.wait()); QCOMPOSITOR_COMPARE(cursorShape()->m_currentShape, CursorShapeDevice::shape_wait); @@ -88,7 +88,7 @@ void tst_cursor::setCursor() // set a shape again window.setCursor(QCursor(Qt::BusyCursor)); QVERIFY(setCursorShapeSpy.wait()); - QCOMPOSITOR_COMPARE(cursorShape()->m_currentShape, CursorShapeDevice::shape_wait); + QCOMPOSITOR_COMPARE(cursorShape()->m_currentShape, CursorShapeDevice::shape_progress); setCursorShapeSpy.clear(); |