32 lines
1.4 KiB
Diff
32 lines
1.4 KiB
Diff
|
From 00b748a08fd27277e4bd8f86b431a1e71423d7ff Mon Sep 17 00:00:00 2001
|
||
|
|
From: peijiankang <peijiankang@kylinos.cn>
|
||
|
|
Date: Mon, 29 Jan 2024 11:04:27 +0800
|
||
|
|
Subject: [PATCH] fix build error of libxkbcommon 1.6.0
|
||
|
|
|
||
|
|
---
|
||
|
|
src/gui/platform/unix/qxkbcommon.cpp | 4 ++++
|
||
|
|
1 file changed, 4 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/src/gui/platform/unix/qxkbcommon.cpp b/src/gui/platform/unix/qxkbcommon.cpp
|
||
|
|
index fc014b38..0de9e98f 100644
|
||
|
|
--- a/src/gui/platform/unix/qxkbcommon.cpp
|
||
|
|
+++ b/src/gui/platform/unix/qxkbcommon.cpp
|
||
|
|
@@ -239,10 +239,14 @@ static constexpr const auto KeyTbl = qMakeArray(
|
||
|
|
Xkb2Qt<XKB_KEY_dead_small_schwa, Qt::Key_Dead_Small_Schwa>,
|
||
|
|
Xkb2Qt<XKB_KEY_dead_capital_schwa, Qt::Key_Dead_Capital_Schwa>,
|
||
|
|
Xkb2Qt<XKB_KEY_dead_greek, Qt::Key_Dead_Greek>,
|
||
|
|
+/* The following four XKB_KEY_dead keys got removed in libxkbcommon 1.6.0
|
||
|
|
+ The define check is kind of version check here. */
|
||
|
|
+#ifdef XKB_KEY_dead_lowline
|
||
|
|
Xkb2Qt<XKB_KEY_dead_lowline, Qt::Key_Dead_Lowline>,
|
||
|
|
Xkb2Qt<XKB_KEY_dead_aboveverticalline, Qt::Key_Dead_Aboveverticalline>,
|
||
|
|
Xkb2Qt<XKB_KEY_dead_belowverticalline, Qt::Key_Dead_Belowverticalline>,
|
||
|
|
Xkb2Qt<XKB_KEY_dead_longsolidusoverlay, Qt::Key_Dead_Longsolidusoverlay>,
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
// Special keys from X.org - This include multimedia keys,
|
||
|
|
// wireless/bluetooth/uwb keys, special launcher keys, etc.
|
||
|
|
--
|
||
|
|
2.41.0
|
||
|
|
|