From f236be7a1a3360c171fa8014e389df775df80612 Mon Sep 17 00:00:00 2001 From: Mikolaj Boc Date: Thu, 28 Jul 2022 10:11:45 +0200 Subject: [PATCH] Use the dead Mac path in QWasmEventTranslator::translateDeadKey MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The path for is_mac is unused. Use it by querying the platform from the new WASM plugin web platform API. Task-number: QTBUG-105213 Change-Id: I9a8922b5e9d215090dbdcc534c056c2cc068c009 Reviewed-by: Lorn Potter (cherry picked from commit e8e584090ba8d360e56bec988bba74baf90ee668) Reviewed-by: Morten Johan Sørvig --- src/plugins/platforms/wasm/qwasmeventtranslator.cpp | 4 ++-- src/plugins/platforms/wasm/qwasmeventtranslator.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/platforms/wasm/qwasmeventtranslator.cpp b/src/plugins/platforms/wasm/qwasmeventtranslator.cpp index edd323294cc..758e6c2da58 100644 --- a/src/plugins/platforms/wasm/qwasmeventtranslator.cpp +++ b/src/plugins/platforms/wasm/qwasmeventtranslator.cpp @@ -244,12 +244,12 @@ static Qt::Key find(const KeyMapping (&map)[N], Qt::Key key) noexcept return find_impl(map, map + N, key); } -Qt::Key QWasmEventTranslator::translateDeadKey(Qt::Key deadKey, Qt::Key accentBaseKey, bool is_mac) +Qt::Key QWasmEventTranslator::translateDeadKey(Qt::Key deadKey, Qt::Key accentBaseKey) { Qt::Key wasmKey = Qt::Key_unknown; if (deadKey == Qt::Key_QuoteLeft ) { - if (is_mac) { // ` macOS: Key_Dead_Grave + if (platform() == Platform::MacOS) { // ` macOS: Key_Dead_Grave wasmKey = find(graveKeyTable, accentBaseKey); } else { wasmKey = find(diaeresisKeyTable, accentBaseKey); diff --git a/src/plugins/platforms/wasm/qwasmeventtranslator.h b/src/plugins/platforms/wasm/qwasmeventtranslator.h index 76da1ebbe5b..c076ba38bc8 100644 --- a/src/plugins/platforms/wasm/qwasmeventtranslator.h +++ b/src/plugins/platforms/wasm/qwasmeventtranslator.h @@ -41,7 +41,7 @@ public: Q_SIGNALS: void getWindowAt(const QPoint &point, QWindow **window); private: - static Qt::Key translateDeadKey(Qt::Key deadKey, Qt::Key accentBaseKey, bool is_mac = false); + static Qt::Key translateDeadKey(Qt::Key deadKey, Qt::Key accentBaseKey); private: static quint64 getTimestamp();