mirror of
https://git.jami.net/savoirfairelinux/jami-client-qt.git
synced 2025-07-27 02:45:34 +02:00
45 lines
2.2 KiB
Diff
45 lines
2.2 KiB
Diff
diff --git a/qtbase/src/corelib/global/qnamespace.h b/qtbase/src/corelib/global/qnamespace.h
|
|
index 8a2769a3ed..584d3620c9 100644
|
|
--- a/qtbase/src/corelib/global/qnamespace.h
|
|
+++ b/qtbase/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/qtbase/src/corelib/global/qnamespace.qdoc b/qtbase/src/corelib/global/qnamespace.qdoc
|
|
index 78c69176d8..1623517b5a 100644
|
|
--- a/qtbase/src/corelib/global/qnamespace.qdoc
|
|
+++ b/qtbase/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/qtbase/src/gui/platform/unix/qxkbcommon.cpp b/qtbase/src/gui/platform/unix/qxkbcommon.cpp
|
|
index fc014b38e2..af1cbbd42a 100644
|
|
--- a/qtbase/src/gui/platform/unix/qxkbcommon.cpp
|
|
+++ b/qtbase/src/gui/platform/unix/qxkbcommon.cpp
|
|
@@ -239,10 +239,6 @@ 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>,
|
|
- 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>,
|
|
|
|
// Special keys from X.org - This include multimedia keys,
|
|
// wireless/bluetooth/uwb keys, special launcher keys, etc.
|