diff --git a/debian/changelog b/debian/changelog index 6a36f9ca..d5700d31 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +qtbase-opensource-src (5.15.8+dfsg-ok2.4) yangtze; urgency=medium + + * BUG号: + #I79FD0【文件管理器】【wayland】侧边栏悬停显示位置不正确 + * 需求号:无 + * 其他更改: + + -- liuyapeng Thu, 04 Jan 2024 14:55:16 +0800 + qtbase-opensource-src (5.15.8+dfsg-ok2.1) yangtze; urgency=medium * BUG号: diff --git a/debian/patches/0037-Update-changelog-to-5.15.8-dfsg-ok2.4.patch b/debian/patches/0037-Update-changelog-to-5.15.8-dfsg-ok2.4.patch new file mode 100644 index 00000000..2b392c77 --- /dev/null +++ b/debian/patches/0037-Update-changelog-to-5.15.8-dfsg-ok2.4.patch @@ -0,0 +1,36 @@ +From: liuyapeng +Date: Thu, 4 Jan 2024 15:15:25 +0800 +Subject: Update changelog to 5.15.8+dfsg-ok2.4 + +--- + src/widgets/kernel/qtooltip.cpp | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) + +diff --git a/src/widgets/kernel/qtooltip.cpp b/src/widgets/kernel/qtooltip.cpp +index add2a44..84054d4 100644 +--- a/src/widgets/kernel/qtooltip.cpp ++++ b/src/widgets/kernel/qtooltip.cpp +@@ -508,14 +508,15 @@ void QToolTip::showText(const QPoint &pos, const QString &text, QWidget *w, cons + else if (!QTipLabel::instance->fadingOut){ + // If the tip has changed, reuse the one + // that is showing (removes flickering) +- QPoint localPos = pos; +- if (w) +- localPos = w->mapFromGlobal(pos); +- if (QTipLabel::instance->tipChanged(localPos, text, w)){ +- QTipLabel::instance->reuseTip(text, msecDisplayTime, pos); +- QTipLabel::instance->setTipRect(w, rect); +- QTipLabel::instance->placeTip(pos, w); +- } ++ // QPoint localPos = pos; ++ // if (w) ++ // localPos = w->mapFromGlobal(pos); ++ // if (QTipLabel::instance->tipChanged(localPos, text, w)){ ++ // QTipLabel::instance->reuseTip(text, msecDisplayTime, pos); ++ // QTipLabel::instance->setTipRect(w, rect); ++ // QTipLabel::instance->placeTip(pos, w); ++ // } ++ QTipLabel::instance->hideTip(); + return; + } + } diff --git a/debian/patches/series b/debian/patches/series index f15ae2cb..22421a3d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -34,3 +34,4 @@ revert_startBlocking_removal.diff 0034-update-debian-changelog.patch 0035-update-debian-changelog.patch 0036-update-debian-changelog-to-5.15.8-dfsg-ok2.1.patch +0037-Update-changelog-to-5.15.8-dfsg-ok2.4.patch