!25 处理维哈柯布局问题

Merge pull request !25 from KevinDuan/openkylin/nile
This commit is contained in:
hanpinlong 2024-08-19 00:50:19 +00:00 committed by openkylin-cibot
parent 02e73fb70e
commit 4033daab37
3 changed files with 31 additions and 0 deletions

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
qtbase-opensource-src (5.15.10+dfsg-3ok2.8) nile; urgency=medium
* 处理维哈柯布局问题.
-- Kevin Duan <duankaiwen@kylinos.cn> Mon, 29 Jul 2024 09:32:06 +0800
qtbase-opensource-src (5.15.10+dfsg-3ok2.7) nile; urgency=medium
* Fix build with libxkbcommon 1.6.0.

24
debian/patches/0048-25.patch vendored Normal file
View File

@ -0,0 +1,24 @@
From: hanpinlong <hanpinlong@kylinos.cn>
Date: Mon, 19 Aug 2024 00:50:19 +0000
Subject: =?utf-8?b?ITI1IOWkhOeQhue7tOWTiOafr+W4g+WxgOmXrumimCBNZXJnZSBwdWxs?=
=?utf-8?b?IHJlcXVlc3QgITI1IGZyb20gS2V2aW5EdWFuL29wZW5reWxpbi9uaWxl?=
---
src/gui/kernel/qguiapplication.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index 3a20188..10915d3 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -230,6 +230,10 @@ extern void qRegisterGuiGetInterpolator();
static bool qt_detectRTLLanguage()
{
+ if(qgetenv("LANGUAGE") == "ug_CN" || qgetenv("LANGUAGE") == "kk_KZ" || qgetenv("LANGUAGE") == "ky_KG" ){
+ return true;
+ }
+
return force_reverse ^
(QGuiApplication::tr("QT_LAYOUT_DIRECTION",
"Translate this string to the string 'LTR' in left-to-right"

View File

@ -45,3 +45,4 @@ revert_startBlocking_removal.diff
0045-rebuild.patch
0046-24-tooltip.patch
0047-Fix-build-with-libxkbcommon-1.6.0.patch
0048-25.patch