From ebb9a17b2cbc3d35b200fc343f1d3edb3f95ee0d Mon Sep 17 00:00:00 2001 From: "openKylin2.0" Date: Mon, 19 Aug 2024 07:36:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E7=BB=B4=E5=93=88=E6=9F=AF?= =?UTF-8?q?=E5=B8=83=E5=B1=80=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 3 +++ debian/changelog | 6 ++++++ src/gui/kernel/qguiapplication.cpp | 4 ++++ 3 files changed, 13 insertions(+) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..24fabb6e --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "cmake.sourceDirectory": "/home/openKylin2.0/test/gitee/test/qtbase-opensource-src/tests/auto/cmake" +} \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index 935d1aa3..585efd19 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +qtbase-opensource-src (5.15.10+dfsg-3ok2.8) nile; urgency=medium + + * 处理维哈柯布局问题. + + -- Kevin Duan 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. diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 3a20188e..10915d3a 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"