diff options
| author | Morten Sørvig <morten.sorvig@qt.io> | 2023-03-07 00:18:17 +0100 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2023-03-14 17:37:13 +0000 |
| commit | 2245a8dbb057811258b6ab5da842b8f547bdd3f7 (patch) | |
| tree | bda1e0b2c5e36a012085c15ce6ecacd1dc3ab007 /src/plugins/platforms/wasm/qwasmcursor.cpp | |
| parent | 360293623094a31586981206e59c92aa6235163d (diff) | |
wasm: restore windowCursor nullptr check
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>
Diffstat (limited to 'src/plugins/platforms/wasm/qwasmcursor.cpp')
| -rw-r--r-- | src/plugins/platforms/wasm/qwasmcursor.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/plugins/platforms/wasm/qwasmcursor.cpp b/src/plugins/platforms/wasm/qwasmcursor.cpp index 1ffa00780d..b341a31b0c 100644 --- a/src/plugins/platforms/wasm/qwasmcursor.cpp +++ b/src/plugins/platforms/wasm/qwasmcursor.cpp @@ -75,11 +75,10 @@ QByteArray cursorShapeToCss(Qt::CursorShape shape) void QWasmCursor::changeCursor(QCursor *windowCursor, QWindow *window) { - if (!window || !window->handle()) + if (!window) return; - - static_cast<QWasmWindow *>(window->handle()) - ->setWindowCursor(cursorShapeToCss(windowCursor->shape())); + if (QWasmWindow *wasmWindow = static_cast<QWasmWindow *>(window->handle())) + wasmWindow->setWindowCursor(windowCursor ? cursorShapeToCss(windowCursor->shape()) : "default"); } QT_END_NAMESPACE |