commit 8b7c1d7800c73c4c7b897d2b81a0f3f720c8d06d
Author: Stephan Witt <sw...@lyx.org>
Date: Sun Oct 31 10:35:15 2021 +0100
#12247 disable Qt5 modifier hack for Qt-5.12 version or newer
backport of commit c5262f04a266cc2e499a4a341daf9528feaa8dd3
---
src/frontends/qt4/GuiKeySymbol.cpp | 3 ++-
status.23x | 2 ++
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/frontends/qt4/GuiKeySymbol.cpp
b/src/frontends/qt4/GuiKeySymbol.cpp
index a01682c..506164b 100644
--- a/src/frontends/qt4/GuiKeySymbol.cpp
+++ b/src/frontends/qt4/GuiKeySymbol.cpp
@@ -745,10 +745,11 @@ bool KeySymbol::operator==(KeySymbol const & ks) const
KeyModifier q_key_state(Qt::KeyboardModifiers state)
{
KeyModifier k = NoModifier;
-#if defined(Q_OS_MAC) && QT_VERSION > 0x050000
+#if defined(Q_OS_MAC) && (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) &&
(QT_VERSION < QT_VERSION_CHECK(5, 12, 0))
/// Additional check for Control and Meta modifier swap state.
/// Starting with Qt 5 the modifiers aren't reported correctly.
/// Until this is fixed a correction is required.
+ /// AFAIK it is fixed at least with Qt 5.12.0
const bool dontSwapCtrlAndMeta =
frontend::theGuiApp()->testAttribute(Qt::AA_MacDontSwapCtrlAndMeta);
#else
diff --git a/status.23x b/status.23x
index 5795714..11782e9 100644
--- a/status.23x
+++ b/status.23x
@@ -42,6 +42,8 @@ What's new
- Add Qt platform name in About dialog.
+- Fix broken modifier handling for Qt-5.12 on Mac (bug 12247).
+
* DOCUMENTATION AND LOCALIZATION
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
