diff options
| author | Jüri Valdmann <juri.valdmann@qt.io> | 2020-10-02 12:19:42 +0200 |
|---|---|---|
| committer | Jüri Valdmann <juri.valdmann@qt.io> | 2020-10-02 13:28:30 +0200 |
| commit | c236dd2ac1ac047fa09f6606f4136a275d132d6d (patch) | |
| tree | da92bdc5d5a8f351caec9aa7eb9d2111f55b734f /src/core/web_event_factory.cpp | |
| parent | 77c489ed4ceb490f33b805e7ba4cd34ef9191db7 (diff) | |
| parent | 7af09a3a51b97d9b3918e35d1452cd6c9d0e1a05 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Id3613b8dcda5629bce9e3cd14fa926567125a960
Diffstat (limited to 'src/core/web_event_factory.cpp')
| -rw-r--r-- | src/core/web_event_factory.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/web_event_factory.cpp b/src/core/web_event_factory.cpp index 2c50287c8..e77463930 100644 --- a/src/core/web_event_factory.cpp +++ b/src/core/web_event_factory.cpp @@ -216,6 +216,9 @@ static quint32 nativeKeyCodeForKeyEvent(const QKeyEvent *ev) #elif defined(Q_OS_MACOS) return keyboardDriver() == KeyboardDriver::Cocoa ? ev->nativeVirtualKey() : 0; #elif defined(Q_OS_LINUX) + // Do not set native code to menu key if it was mapped to something else. + if (ev->nativeScanCode() == 135 && ev->key() != Qt::Key_Menu) + return 0; return keyboardDriver() == KeyboardDriver::Xkb ? ev->nativeScanCode() : 0; #else return 0; // 0 means unknown, KeyboardEvent.code will be empty string. |