commit 3cce4fdc7d9a9ee6105e6dabfa8c6c5079a08e4e
Author: Jean-Marc Lasgouttes <lasgout...@lyx.org>
Date: Sun Feb 16 22:22:20 2025 +0100
Revert "Make a test for Cocoa dynamic"
This did not work with Qt5.
This reverts commit 4f1594813080218879a4d6d6bdc56c96b2c7af0d.
---
src/frontends/qt/GuiInputMethod.cpp | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/frontends/qt/GuiInputMethod.cpp
b/src/frontends/qt/GuiInputMethod.cpp
index 0833719a6c..372811a75e 100644
--- a/src/frontends/qt/GuiInputMethod.cpp
+++ b/src/frontends/qt/GuiInputMethod.cpp
@@ -256,10 +256,12 @@ void GuiInputMethod::setPreeditStyle(
// Since Qt6 and on MacOS, the initial entry seems to deliver
information
// about the focused segment (undocumented). We formulate the code to
// utilize this fact keeping fail-safe against its failure.
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
- bool initial_tf_entry = guiApp->platformName() == "cocoa";
-#endif
+#if defined(Q_OS_MACOS) && QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ bool initial_tf_entry = true;
+#else
+ bool initial_tf_entry = false;
+#endif
// max segment position whose information we already have
pos_type max_start = -1;
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
https://lists.lyx.org/mailman/listinfo/lyx-cvs
