From 974f23933838515d840361cdd4ed1d791b14250c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= Date: Fri, 5 Jun 2020 18:07:15 +0200 Subject: Check for valid Navigator.permissions before use Safari on iOS now supports the Navigator.clipboard API, but not the Navigator.permissions API. Looks like we have not encountered this combination Before. Add undefined check for permissions as well. Fixes: QTBUG-84658 Pick-to: 5.15 Change-Id: I99ab08fd34bbb29a82661e24bf400c927f3604f6 Reviewed-by: Lorn Potter --- src/plugins/platforms/wasm/qwasmclipboard.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/plugins/platforms/wasm') diff --git a/src/plugins/platforms/wasm/qwasmclipboard.cpp b/src/plugins/platforms/wasm/qwasmclipboard.cpp index 890b01fa3c..713adee8f9 100644 --- a/src/plugins/platforms/wasm/qwasmclipboard.cpp +++ b/src/plugins/platforms/wasm/qwasmclipboard.cpp @@ -126,9 +126,10 @@ EMSCRIPTEN_BINDINGS(qtClipboardModule) { QWasmClipboard::QWasmClipboard() { val clipboard = val::global("navigator")["clipboard"]; - hasClipboardApi = (!clipboard.isUndefined() && !clipboard["readText"].isUndefined()); - - initClipboardEvents(); + val permissions = val::global("navigator")["permissions"]; + hasClipboardApi = (!clipboard.isUndefined() && !permissions.isUndefined() && !clipboard["readText"].isUndefined()); + if (hasClipboardApi) + initClipboardEvents(); } QWasmClipboard::~QWasmClipboard() -- cgit v1.2.3