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

!22 添加飞行键值 

Merge pull request !22 from Augenblick/openkylin/nile
This commit is contained in:
Augenblick 2024-04-08 09:35:07 +00:00 committed by openkylin-cibot
parent 95f28179f5
commit fb1a6b21d7
2 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
debian/patches/0041-22.patch vendored Normal file
View File

@ -0,0 +1,51 @@
From: Augenblick <liuyapeng@kylinos.cn>
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<XKB_KEY_XF86LaunchC, Qt::Key_LaunchE>,
Xkb2Qt<XKB_KEY_XF86LaunchD, Qt::Key_LaunchF>,
Xkb2Qt<XKB_KEY_XF86LaunchE, Qt::Key_LaunchG>,
- Xkb2Qt<XKB_KEY_XF86LaunchF, Qt::Key_LaunchH>
+ Xkb2Qt<XKB_KEY_XF86LaunchF, Qt::Key_LaunchH>,
+ Xkb2Qt<XKB_KEY_XF86RFKill, Qt::Key_RFKill>
>::Data{}
);

1
debian/patches/series vendored
View File

@ -38,3 +38,4 @@ revert_startBlocking_removal.diff
0038-patch.patch
0039-2.patch
0040-3.patch
0041-22.patch