From ee6675aee09e65908caa5537ca46f3b61bf56248 Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Wed, 4 Nov 2020 18:17:33 +0100
Subject: [PATCH] No longer need Core5Compat

---
 CMakeLists.txt                             | 7 -------
 README.md                                  | 2 --
 ext/libstrawberry-tagreader/CMakeLists.txt | 4 ----
 3 files changed, 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d943074a..83baa4a8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -170,9 +170,6 @@ endif()
 if(WIN32)
   list(APPEND QT_COMPONENTS WinExtras)
 endif()
-if(QT_MAJOR_VERSION EQUAL 6)
-  list(APPEND QT_COMPONENTS Core5Compat)
-endif()
 
 find_package(Qt${QT_MAJOR_VERSION} REQUIRED COMPONENTS ${QT_COMPONENTS})
 
@@ -182,10 +179,6 @@ set(QtWidgets_LIBRARIES Qt${QT_MAJOR_VERSION}::Widgets)
 set(QtNetwork_LIBRARIES Qt${QT_MAJOR_VERSION}::Network)
 set(QtSql_LIBRARIES Qt${QT_MAJOR_VERSION}::Sql)
 set(QT_LIBRARIES Qt${QT_MAJOR_VERSION}::Core Qt${QT_MAJOR_VERSION}::Concurrent Qt${QT_MAJOR_VERSION}::Widgets Qt${QT_MAJOR_VERSION}::Network Qt${QT_MAJOR_VERSION}::Sql)
-if(QT_MAJOR_VERSION EQUAL 6)
-  set(QtCore5Compat_LIBRARIES Qt${QT_MAJOR_VERSION}::Core5Compat)
-  list(APPEND QT_LIBRARIES Qt${QT_MAJOR_VERSION}::Core5Compat)
-endif()
 if(Qt${QT_MAJOR_VERSION}DBus_FOUND)
   set(QtDBus_LIBRARIES Qt${QT_MAJOR_VERSION}::DBus)
   list(APPEND QT_LIBRARIES Qt${QT_MAJOR_VERSION}::DBus)
diff --git a/README.md b/README.md
index 15bdbb1c..9871de4b 100644
--- a/README.md
+++ b/README.md
@@ -84,8 +84,6 @@ Optional dependencies:
 Either GStreamer or VLC engine is required, but only GStreamer is fully implemented so far.
 You should also install the gstreamer plugins base and good, and optionally bad and ugly.
 
-With Qt 6 we also depend on the Core5Compat module for QTextCodec.
-
 ### :wrench:	Compiling from source
 
 ### Get the code:
diff --git a/ext/libstrawberry-tagreader/CMakeLists.txt b/ext/libstrawberry-tagreader/CMakeLists.txt
index 3db36f90..e1c099b5 100644
--- a/ext/libstrawberry-tagreader/CMakeLists.txt
+++ b/ext/libstrawberry-tagreader/CMakeLists.txt
@@ -35,7 +35,3 @@ target_link_libraries(libstrawberry-tagreader PRIVATE
   ${QtNetwork_LIBRARIES}
   libstrawberry-common
 )
-
-if(BUILD_WITH_QT6)
-  target_link_libraries(libstrawberry-tagreader PRIVATE Qt6::Core5Compat)
-endif()