1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wasm: restore windowCursor nullptr check

Browse Source 
This check was accidentally removed in commit 783b63ce.

If the cursor is null, set the default cursor.

Pick-to: 6.5 6.5.0
Change-Id: I894d5e04cd7b49041bd0d3b59fc816a8b7efffe7
Reviewed-by: Mikołaj Boc <Mikolaj.Boc@qt.io>
This commit is contained in:
Morten Sørvig 2023-03-07 00:18:17 +01:00 committed by Morten Johan Sørvig
parent 3602936230
commit 2245a8dbb0
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/platforms/wasm/qwasmcursor.cpp
View File

@ -75,11 +75,10 @@ QByteArray cursorShapeToCss(Qt::CursorShape shape)
void QWasmCursor::changeCursor(QCursor *windowCursor, QWindow *window) void QWasmCursor::changeCursor(QCursor *windowCursor, QWindow *window)
{ {
if (!window || !window->handle()) if (!window)
return; return;
if (QWasmWindow *wasmWindow = static_cast<QWasmWindow *>(window->handle()))
static_cast<QWasmWindow *>(window->handle()) wasmWindow->setWindowCursor(windowCursor ? cursorShapeToCss(windowCursor->shape()) : "default");
->setWindowCursor(cursorShapeToCss(windowCursor->shape()));
} }
QT_END_NAMESPACE QT_END_NAMESPACE