Qt 6.9: Call beginFilterChange and use QKeyEvent::matches

mapeditor · Jan 7, 2025 · bb60bbb · bb60bbb
1 parent dc912a7
commit bb60bbb
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/src/tiled/issuesdock.cpp b/src/tiled/issuesdock.cpp
@@ -35,8 +35,6 @@
 #include <QStyledItemDelegate>
 #include <QVBoxLayout>
 
-#include <memory>
-
 namespace Tiled {
 
 class IssueFilterModel : public QSortFilterProxyModel
@@ -51,6 +49,9 @@ class IssueFilterModel : public QSortFilterProxyModel
         if (mShowWarnings == showWarnings)
             return;
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
+        beginFilterChange();
+#endif
         mShowWarnings = showWarnings;
         invalidateFilter();
     }

diff --git a/src/tiled/newsfeed.cpp b/src/tiled/newsfeed.cpp
@@ -114,7 +114,11 @@ int NewsFeed::unreadCount() const
 
 void NewsFeed::timerEvent(QTimerEvent *event)
 {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
+    if (event->matches(mRefreshTimer)) {
+#else
     if (event->timerId() == mRefreshTimer.timerId()) {
+#endif
         refresh();
         return;
     }

diff --git a/src/tiled/newversionchecker.cpp b/src/tiled/newversionchecker.cpp
@@ -85,7 +85,11 @@ bool NewVersionChecker::isNewVersionAvailable() const
 
 void NewVersionChecker::timerEvent(QTimerEvent *event)
 {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
+    if (event->matches(mRefreshTimer)) {
+#else
     if (event->timerId() == mRefreshTimer.timerId()) {
+#endif
         refresh();
         return;
     }

diff --git a/src/tiled/tilesetdocumentsmodel.cpp b/src/tiled/tilesetdocumentsmodel.cpp
@@ -115,6 +115,9 @@ void TilesetDocumentsFilterModel::setMapDocument(MapDocument *mapDocument)
     if (mMapDocument == mapDocument)
         return;
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
+    beginFilterChange();
+#endif
     mMapDocument = mapDocument;
     invalidateFilter();
 }