From d332a6777ad84ca00b8e498aebbf49c7c2b73676 Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Wed, 29 Jul 2020 21:39:02 +0200
Subject: [PATCH] Use QSortFilterProxyModel::filterRegularExpression only with
 Qt 6

---
 src/playlist/playlistcontainer.cpp | 5 +----
 src/playlist/playlistfilter.cpp    | 3 ---
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/playlist/playlistcontainer.cpp b/src/playlist/playlistcontainer.cpp
index 10d73264e..3116f913d 100644
--- a/src/playlist/playlistcontainer.cpp
+++ b/src/playlist/playlistcontainer.cpp
@@ -46,9 +46,6 @@
 #include <QUndoStack>
 #include <QtEvents>
 #include <QSettings>
-#if QT_VERSION < QT_VERSION_CHECK(5, 12, 0)
-#  include <QRegExp>
-#endif
 
 #include "core/iconloader.h"
 #include "playlist.h"
@@ -200,7 +197,7 @@ void PlaylistContainer::SetViewModel(Playlist *playlist) {
   emit ViewSelectionModelChanged();
 
   // Update filter
-#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
   ui_->filter->setText(playlist->proxy()->filterRegularExpression().pattern());
 #else
   ui_->filter->setText(playlist->proxy()->filterRegExp().pattern());
diff --git a/src/playlist/playlistfilter.cpp b/src/playlist/playlistfilter.cpp
index 16b60e3a8..84c2d89c8 100644
--- a/src/playlist/playlistfilter.cpp
+++ b/src/playlist/playlistfilter.cpp
@@ -25,9 +25,6 @@
 #include <QRegularExpression>
 #include <QAbstractItemModel>
 #include <QSortFilterProxyModel>
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-#  include <QRegExp>
-#endif
 
 #include "playlist/playlist.h"
 #include "playlistfilter.h"