|
| 1 | +Description: <QTBUG-117950> |
| 2 | + error: 'XKB_KEY_dead_lowline' was not declared in this scope |
| 3 | + |
| 4 | +qtbase-opensource-src (5.15.8-1+deepin3) UNRELEASED; urgency=medium |
| 5 | + |
| 6 | + [ LiChengGang ] |
| 7 | + * Add QTBUG-117950-Fix-XKB_KEY_dead_lowlin, solve build error. |
| 8 | + |
| 9 | + -- LiChengGang < [email protected]> Mon, 11 Dec 2023 11:01:53 +0800 |
| 10 | + |
| 11 | + |
| 12 | +--- |
| 13 | + |
| 14 | +Last-Update: 2023-12-11 |
| 15 | + |
| 16 | +--- qtbase-opensource-src-5.15.8.orig/src/platformsupport/input/xkbcommon/qxkbcommon.cpp |
| 17 | ++++ qtbase-opensource-src-5.15.8/src/platformsupport/input/xkbcommon/qxkbcommon.cpp |
| 18 | +@@ -273,11 +273,14 @@ static constexpr const auto KeyTbl = qMa |
| 19 | + Xkb2Qt<XKB_KEY_dead_small_schwa, Qt::Key_Dead_Small_Schwa>, |
| 20 | + Xkb2Qt<XKB_KEY_dead_capital_schwa, Qt::Key_Dead_Capital_Schwa>, |
| 21 | + Xkb2Qt<XKB_KEY_dead_greek, Qt::Key_Dead_Greek>, |
| 22 | ++/* The following four XKB_KEY_dead keys got removed in libxkbcommon 1.6.0 |
| 23 | ++ The define check is kind of version check here. */ |
| 24 | ++#ifdef XKB_KEY_dead_lowline |
| 25 | + Xkb2Qt<XKB_KEY_dead_lowline, Qt::Key_Dead_Lowline>, |
| 26 | + Xkb2Qt<XKB_KEY_dead_aboveverticalline, Qt::Key_Dead_Aboveverticalline>, |
| 27 | + Xkb2Qt<XKB_KEY_dead_belowverticalline, Qt::Key_Dead_Belowverticalline>, |
| 28 | + Xkb2Qt<XKB_KEY_dead_longsolidusoverlay, Qt::Key_Dead_Longsolidusoverlay>, |
| 29 | +- |
| 30 | ++#endif |
| 31 | + // Special keys from X.org - This include multimedia keys, |
| 32 | + // wireless/bluetooth/uwb keys, special launcher keys, etc. |
| 33 | + Xkb2Qt<XKB_KEY_XF86Back, Qt::Key_Back>, |
0 commit comments