diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2020-05-04 14:08:47 +0200 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2020-05-05 09:08:31 +0200 |
| commit | 53498cb73392a222a113ae257f24f91e6d912518 (patch) | |
| tree | 03155fdc40d5da4dc51a26dc0c28b402b2a23e5d /src/core | |
| parent | 00f7ad50e99037a121c684726065c416b0b995eb (diff) | |
Fix AltGr on Windows
Fixes: QTBUG-83710
Change-Id: Iaf5a33c0aeb53348d36cb7dda60602041299cd50
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/web_event_factory.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/core/web_event_factory.cpp b/src/core/web_event_factory.cpp index 9824b3f37..e1db69b16 100644 --- a/src/core/web_event_factory.cpp +++ b/src/core/web_event_factory.cpp @@ -178,8 +178,13 @@ static QString qtTextForKeyEvent(const QKeyEvent *ev, int qtKey, Qt::KeyboardMod { QString text = ev->text(); - if ((qtModifiers & Qt::ControlModifier) && - (keyboardDriver() == KeyboardDriver::Xkb || keyboardDriver() == KeyboardDriver::Windows)) { + if (keyboardDriver() == KeyboardDriver::Xkb && (qtModifiers & Qt::ControlModifier)) { + text.clear(); + } + + // Keep text for Ctrl+Alt key combinations on Windows. It is an alternative for AltGr. + if (keyboardDriver() == KeyboardDriver::Windows + && (qtModifiers & Qt::ControlModifier) && !(qtModifiers & Qt::AltModifier)) { text.clear(); } |