[education/rkward] /: Remove dependency on qt5compat

[Thomas Friedrichsmeier]

Git commit 2eb2aba4b948415f8e6f4da04dcbc0319c638ecc by Thomas Friedrichsmeier.
Committed on 22/04/2025 at 14:49.
Pushed by tfry into branch 'master'.

Remove dependency on qt5compat

M  +1    -1    CMakeLists.txt
M  +1    -0    ChangeLog
M  +1    -1    rkward/core/CMakeLists.txt
M  +1    -1    rkward/windows/CMakeLists.txt
M  +0    -1    rkward/windows/rkhtmlwindow.cpp

https://invent.kde.org/education/rkward/-/commit/2eb2aba4b948415f8e6f4da04dcbc0319c638ecc

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1af6cd172..a2ee82946 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,7 +22,7 @@ INCLUDE(ECMAddAppIcon)
 INCLUDE(ECMMarkNonGuiExecutable)
 INCLUDE(FeatureSummary)
 
-FIND_PACKAGE(Qt6 6.6 CONFIG REQUIRED COMPONENTS Widgets Core Xml Network Qml PrintSupport WebEngineWidgets Core5Compat DBus) # TODO: remove compat
+FIND_PACKAGE(Qt6 6.6 CONFIG REQUIRED COMPONENTS Widgets Core Xml Network Qml PrintSupport WebEngineWidgets DBus)
 FIND_PACKAGE(KF6 6.0.0 REQUIRED COMPONENTS CoreAddons DocTools I18n XmlGui TextEditor WidgetsAddons Parts Config Notifications WindowSystem Archive BreezeIcons OPTIONAL_COMPONENTS Crash)
 FIND_PACKAGE(Gettext REQUIRED)
 
diff --git a/ChangeLog b/ChangeLog
index d6b5624d9..15bd2afb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 --- Version 0.8.2 - UNRELEASED
+- Internal: Remove dependency on Qt5-compatibility library
 
 --- Version 0.8.1 - Apr-21-2025
 - Added: Allow to register custom R functions in the menu (rk.menu())
diff --git a/rkward/core/CMakeLists.txt b/rkward/core/CMakeLists.txt
index 79444c8be..57e93b587 100644
--- a/rkward/core/CMakeLists.txt
+++ b/rkward/core/CMakeLists.txt
@@ -17,5 +17,5 @@ SET(core_STAT_SRCS
    )
 
 ADD_LIBRARY(core STATIC ${core_STAT_SRCS})
-TARGET_LINK_LIBRARIES(core Qt6::Core Qt6::Widgets Qt6::Core5Compat KF6::WidgetsAddons KF6::I18n KF6::Parts)
+TARGET_LINK_LIBRARIES(core Qt6::Core Qt6::Widgets KF6::WidgetsAddons KF6::I18n KF6::Parts)
 
diff --git a/rkward/windows/CMakeLists.txt b/rkward/windows/CMakeLists.txt
index 88195c0ea..3626b3a1e 100644
--- a/rkward/windows/CMakeLists.txt
+++ b/rkward/windows/CMakeLists.txt
@@ -32,4 +32,4 @@ SET(windows_STAT_SRCS
 )
 
 ADD_LIBRARY(windows STATIC ${windows_STAT_SRCS})
-TARGET_LINK_LIBRARIES(windows Qt6::Widgets Qt6::PrintSupport Qt6::Core5Compat Qt6::WebEngineWidgets KF6::TextEditor KF6::Notifications KF6::WindowSystem KF6::KIOFileWidgets KF6::I18n)
+TARGET_LINK_LIBRARIES(windows Qt6::Widgets Qt6::PrintSupport Qt6::WebEngineWidgets KF6::TextEditor KF6::Notifications KF6::WindowSystem KF6::KIOFileWidgets KF6::I18n)
diff --git a/rkward/windows/rkhtmlwindow.cpp b/rkward/windows/rkhtmlwindow.cpp
index 5797ddfe5..019dfa642 100644
--- a/rkward/windows/rkhtmlwindow.cpp
+++ b/rkward/windows/rkhtmlwindow.cpp
@@ -28,7 +28,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
 #include <QPrintDialog>
 #include <QMenu>
 #include <QFileDialog>
-#include <QTextCodec>
 #include <QFontDatabase>
 #include <QTemporaryFile>
 #include <QGuiApplication>