openkylin
/
qtbase-opensource-src
mirror of https://gitee.com/openkylin/qtbase-opensource-src.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix build with libxkbcommon 1.6.0

This commit is contained in:
Rewnosor 2024-07-29 09:33:23 +08:00
parent f4ec69a3d2
commit 1d8fd4ad96
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
qtbase-opensource-src (5.15.10+dfsg-3ok2.7) nile; urgency=medium
* Fix build with libxkbcommon 1.6.0.
-- liwenjun <liwenjun@kylinos.cn> Mon, 29 Jul 2024 09:32:06 +0800
qtbase-opensource-src (5.15.10+dfsg-3ok2.6) nile; urgency=medium
* BUG号：无

4
src/platformsupport/input/xkbcommon/qxkbcommon.cpp
View File

@ -273,10 +273,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.