commit 16d1133e19d52733734c7e2bff490a36b91eb4c8
Author: Koji Yokota <[email protected]>
Date: Thu Feb 27 21:49:33 2025 +0900
Fix deprecated QKeySequence operator
Operator '+' to express key combination is deprecated over operator '|'
in Qt6
---
src/frontends/qt/GuiPrefs.cpp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/frontends/qt/GuiPrefs.cpp b/src/frontends/qt/GuiPrefs.cpp
index 31c71a13b1..c4198e7209 100644
--- a/src/frontends/qt/GuiPrefs.cpp
+++ b/src/frontends/qt/GuiPrefs.cpp
@@ -1042,9 +1042,14 @@ PrefColors::PrefColors(GuiPreferences * form)
new QShortcut(QKeySequence(QKeySequence::FindPrevious), this);
#if !defined(Q_OS_MAC)
// give a shortcut to the combobox
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
QShortcut* sc_load_theme =
new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_L), this);
-#endif
+#else
+ QShortcut* sc_load_theme =
+ new QShortcut(QKeySequence(Qt::CTRL | Qt::Key_L), this);
+#endif // QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+#endif // !defined(Q_OS_MAC)
initializeLoadThemeCO();
--
lyx-cvs mailing list
[email protected]
https://lists.lyx.org/mailman/listinfo/lyx-cvs
