summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/wasm/qwasmcompositor.cpp
diff options
context:
space:
mode:
authorMikolaj Boc <mikolaj.boc@qt.io>2022-09-06 12:56:42 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-09-10 16:50:52 +0000
commitffa3c3579acaf3291b0cfa7e5670313d576d5d49 (patch)
tree77536af94af15f632b9f91c0e1229d1f05760550 /src/plugins/platforms/wasm/qwasmcompositor.cpp
parent9fe9c41f8377d4194108c69b3fc684532c630e9c (diff)
Propagate the copy event correctly to Qt widgets on WASM
The event should be propagated when the native clipboard is available. A recent regression caused it to be suppressed, which resulted in lack of copy/paste capabilities. Change-Id: I030a31aa0951c3813ce1d38da9a6526010b3bfc8 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> (cherry picked from commit adebdd0f9af0ffe47250b4a273407b84a6c61879) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/plugins/platforms/wasm/qwasmcompositor.cpp')
-rw-r--r--src/plugins/platforms/wasm/qwasmcompositor.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/plugins/platforms/wasm/qwasmcompositor.cpp b/src/plugins/platforms/wasm/qwasmcompositor.cpp
index b167390850..7dee14a97e 100644
--- a/src/plugins/platforms/wasm/qwasmcompositor.cpp
+++ b/src/plugins/platforms/wasm/qwasmcompositor.cpp
@@ -1151,13 +1151,8 @@ bool QWasmCompositor::processKeyboard(int eventType, const EmscriptenKeyboardEve
const QFlags<Qt::KeyboardModifier> modifiers = KeyboardModifier::getForEvent(*emKeyEvent);
- // Clipboard path: cut/copy/paste are handled by clipboard event or direct clipboard access.
- if (translatedEvent.type == QEvent::KeyPress && modifiers.testFlag(Qt::ControlModifier)
- && (translatedEvent.key == Qt::Key_X || translatedEvent.key == Qt::Key_V
- || translatedEvent.key == Qt::Key_C)) {
- QWasmIntegration::get()->getWasmClipboard()->isPaste = translatedEvent.key == Qt::Key_V;
- return false; // continue on to event
- }
+ if (QWasmIntegration::get()->getWasmClipboard()->processKeyboard(translatedEvent, modifiers))
+ return false;
if (translatedEvent.text.isEmpty())
translatedEvent.text = QString(emKeyEvent->key);