Skip to content

fix(dock): support Qt 6.10 filter invalidation #1735

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
felixonmars wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −1
Open

fix(dock): support Qt 6.10 filter invalidation #1735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion panels/dock/taskmanager/hoverpreviewproxymodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2025 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2025-2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand All @@ -22,7 +22,11 @@ void HoverPreviewProxyModel::setFilter(QString filter, enum FilterMode mode)
m_filter = filter;
m_filterMode = mode;

#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0)
endFilterChange(Direction::Both);
#else
invalidateFilter();
#endif
}

void HoverPreviewProxyModel::clearFilter()
Expand Down
4 changes: 4 additions & 0 deletions panels/dock/tray/ksortfilterproxymodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,11 @@

void KSortFilterProxyModel::invalidateFilter()
{
#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0)
QSortFilterProxyModel::endFilterChange(QSortFilterProxyModel::Direction::Both);
#else

@BLumia BLumia Sep 14, 2026 •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

怪怪的，没有 begin 只有 end。后续我详细测一下。

https://github.com/KDE/kitemmodels/blob/00e7da79f72ce1f4f8d3de91c6a9a6bece3a555b/src/qml/ksortfilterproxymodel.cpp#L311

上游也还没做相关修改。

QSortFilterProxyModel::invalidateFilter();
#endif
}

#include "moc_ksortfilterproxymodel.cpp"

Check warning on line 256 in panels/dock/tray/ksortfilterproxymodel.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: "moc_ksortfilterproxymodel.cpp" not found.
Loading