diff --git a/desktop/toolkit/qt5/qt5-base/files/0015-remove-deleted-xkb-keys.patch b/desktop/toolkit/qt5/qt5-base/files/0015-remove-deleted-xkb-keys.patch new file mode 100644 index 0000000000..0c10c9507e --- /dev/null +++ b/desktop/toolkit/qt5/qt5-base/files/0015-remove-deleted-xkb-keys.patch @@ -0,0 +1,45 @@ +diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h +index 8a2769a3ed..584d3620c9 100644 +--- a/src/corelib/global/qnamespace.h ++++ b/src/corelib/global/qnamespace.h +@@ -832,10 +832,6 @@ namespace Qt { + Key_Dead_Small_Schwa = 0x0100128a, + Key_Dead_Capital_Schwa = 0x0100128b, + Key_Dead_Greek = 0x0100128c, +- Key_Dead_Lowline = 0x01001290, +- Key_Dead_Aboveverticalline = 0x01001291, +- Key_Dead_Belowverticalline = 0x01001292, +- Key_Dead_Longsolidusoverlay = 0x01001293, + + // multimedia/internet keys - ignored by default - see QKeyEvent c'tor + Key_Back = 0x01000061, +diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc +index 78c69176d8..1623517b5a 100644 +--- a/src/corelib/global/qnamespace.qdoc ++++ b/src/corelib/global/qnamespace.qdoc +@@ -1654,10 +1654,6 @@ + \value Key_Dead_Small_Schwa + \value Key_Dead_Capital_Schwa + \value Key_Dead_Greek +- \value Key_Dead_Lowline +- \value Key_Dead_Aboveverticalline +- \value Key_Dead_Belowverticalline +- \value Key_Dead_Longsolidusoverlay + \value Key_Back + \value Key_Forward + \value Key_Stop +diff --git a/src/gui/platform/unix/qxkbcommon.cpp b/src/gui/platform/unix/qxkbcommon.cpp +index fc014b38e2..af1cbbd42a 100644 +--- a/src/gui/platform/unix/qxkbcommon.cpp ++++ b/src/gui/platform/unix/qxkbcommon.cpp +@@ -239,10 +239,6 @@ static constexpr const auto KeyTbl = qMakeArray( + Xkb2Qt, + Xkb2Qt, + Xkb2Qt, +- Xkb2Qt, +- Xkb2Qt, +- Xkb2Qt, +- Xkb2Qt, + + // Special keys from X.org - This include multimedia keys, + // wireless/bluetooth/uwb keys, special launcher keys, etc. diff --git a/desktop/toolkit/qt5/qt5-base/pspec.xml b/desktop/toolkit/qt5/qt5-base/pspec.xml index 0ec492ce26..f5650e945d 100755 --- a/desktop/toolkit/qt5/qt5-base/pspec.xml +++ b/desktop/toolkit/qt5/qt5-base/pspec.xml @@ -11,7 +11,7 @@ Cross platform application and UI framework Cross platform application and UI development framework 'GPL3' 'LGPL3' 'FDL' 'custom' - https://invent.kde.org/qt/qt/qtbase/-/archive/kde/5.15/qtbase-kde-5.15.tar.bz2 + https://invent.kde.org/qt/qt/qtbase/-/archive/kde/5.15/qtbase-kde-5.15.tar.bz2 @@ -89,7 +89,7 @@ mkspecs.patch qt5-base-nostrip.patch - +