From fb1a6b21d787764119d429bcddf8ca3a5035ca63 Mon Sep 17 00:00:00 2001 From: Augenblick Date: Mon, 8 Apr 2024 09:35:07 +0000 Subject: [PATCH] =?UTF-8?q?!22=20=E6=B7=BB=E5=8A=A0=E9=A3=9E=E8=A1=8C?= =?UTF-8?q?=E9=94=AE=E5=80=BC=20Merge=20pull=20request=20!22=20from=20Auge?= =?UTF-8?q?nblick/openkylin/nile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/patches/0041-22.patch | 51 ++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 52 insertions(+) create mode 100644 debian/patches/0041-22.patch diff --git a/debian/patches/0041-22.patch b/debian/patches/0041-22.patch new file mode 100644 index 00000000..ae8836ee --- /dev/null +++ b/debian/patches/0041-22.patch @@ -0,0 +1,51 @@ +From: Augenblick +Date: Mon, 8 Apr 2024 09:35:07 +0000 +Subject: =?utf-8?b?ITIyIOa3u+WKoOmjnuihjOmUruWAvCBNZXJnZSBwdWxsIHJlcXVlc3Qg?= + =?utf-8?b?ITIyIGZyb20gQXVnZW5ibGljay9vcGVua3lsaW4vbmlsZQ==?= + +--- + src/corelib/global/qnamespace.h | 2 +- + src/gui/kernel/qkeysequence.cpp | 2 +- + src/platformsupport/input/xkbcommon/qxkbcommon.cpp | 3 ++- + 3 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h +index ad4150b..e80129b 100644 +--- a/src/corelib/global/qnamespace.h ++++ b/src/corelib/global/qnamespace.h +@@ -1085,7 +1085,7 @@ public: + Key_Find = 0x01000122, + Key_Undo = 0x01000123, + Key_Redo = 0x01000124, +- ++ Key_RFKill = 0x01000125, + Key_MediaLast = 0x0100ffff, + + // Keypad navigation keys +diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp +index 23be5e1..b6a220c 100644 +--- a/src/gui/kernel/qkeysequence.cpp ++++ b/src/gui/kernel/qkeysequence.cpp +@@ -588,7 +588,7 @@ static const struct { + { Qt::Key_TopMenu, QT_TRANSLATE_NOOP("QShortcut", "Top Menu") }, + { Qt::Key_PowerDown, QT_TRANSLATE_NOOP("QShortcut", "Power Down") }, + { Qt::Key_Suspend, QT_TRANSLATE_NOOP("QShortcut", "Suspend") }, +- ++ { Qt::Key_RFKill, QT_TRANSLATE_NOOP("QShortcut", "RFKill") }, + { Qt::Key_MicMute, QT_TRANSLATE_NOOP("QShortcut", "Microphone Mute") }, + + { Qt::Key_Red, QT_TRANSLATE_NOOP("QShortcut", "Red") }, +diff --git a/src/platformsupport/input/xkbcommon/qxkbcommon.cpp b/src/platformsupport/input/xkbcommon/qxkbcommon.cpp +index 0c8545b..4d6beb1 100644 +--- a/src/platformsupport/input/xkbcommon/qxkbcommon.cpp ++++ b/src/platformsupport/input/xkbcommon/qxkbcommon.cpp +@@ -423,7 +423,8 @@ static constexpr const auto KeyTbl = qMakeArray( + Xkb2Qt, + Xkb2Qt, + Xkb2Qt, +- Xkb2Qt ++ Xkb2Qt, ++ Xkb2Qt + >::Data{} + ); + diff --git a/debian/patches/series b/debian/patches/series index 865568b0..7cb9105b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -38,3 +38,4 @@ revert_startBlocking_removal.diff 0038-patch.patch 0039-2.patch 0040-3.patch +0041-22.patch