Merge pull request !13 from hanpinlong/openkylin/yangtze
This commit is contained in:
hanpinlong 2023-05-24 08:29:09 +00:00 committed by cckylin-cibot
parent bf51caf8ab
commit 16de107a33
3 changed files with 23 additions and 1 deletions

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
qtbase-opensource-src (5.15.8+dfsg-ok1.3) yangtze; urgency=medium
qtbase-opensource-src (5.15.8+dfsg-ok1.4) yangtze; urgency=medium
* BUG号
-I72L6W【X】【触摸】桌面触摸长按出现右键菜单之后桌面触摸失效任务栏触摸正常

21
debian/patches/0032-13-rebuild.patch vendored Normal file
View File

@ -0,0 +1,21 @@
From: hanpinlong <hanpinlong@kylinos.cn>
Date: Wed, 24 May 2023 08:29:09 +0000
Subject: !13 rebuild Merge pull request !13 from hanpinlong/openkylin/yangtze
---
src/gui/kernel/qguiapplication.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index 29e2e61..d2a265b 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -3057,7 +3057,7 @@ void QGuiApplicationPrivate::processTouchEvent(QWindowSystemInterfacePrivate::To
QEvent::Type mouseEventType = QEvent::MouseMove;
Qt::MouseButton button = Qt::NoButton;
Qt::MouseButtons buttons = Qt::LeftButton;
- if (eventType == QEvent::TouchBegin && m_fakeMouseSourcePointId < 0)
+ if ((eventType == QEvent::TouchBegin && m_fakeMouseSourcePointId < 0)
|| (touchPoints.count() == 1 && m_fakeMouseSourcePointId != touchPoints.first().id()))
m_fakeMouseSourcePointId = touchPoints.first().id();
for (const auto &touchPoint : touchPoints) {

View File

@ -29,3 +29,4 @@ revert_startBlocking_removal.diff
0029-3-try-rebuild.patch
0030-5-2.patch
0031-10-changelog.patch
0032-13-rebuild.patch