diff --git a/CMakeLists.txt b/CMakeLists.txt index 3676c9df4..35cdbab03 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ cmake_minimum_required(VERSION 3.13 FATAL_ERROR) # Match KDE Frameworks update Apr 2021 set (QT_MIN_VERSION "5.15.0") -set (KF5_MIN_VERSION "5.71.0") +set (KF5_MIN_VERSION "5.86.0") # Release script will create bugzilla versions project(konsole VERSION ${RELEASE_SERVICE_VERSION}) diff --git a/src/tests/PartManualTest.cpp b/src/tests/PartManualTest.cpp index 7562f66e4..dc055ce5d 100644 --- a/src/tests/PartManualTest.cpp +++ b/src/tests/PartManualTest.cpp @@ -20,8 +20,6 @@ // KDE #include #include -#include -#include #include // Konsole @@ -105,14 +103,11 @@ void PartManualTest::shortcutTriggered() KParts::Part *PartManualTest::createPart() { - KService::Ptr service = KService::serviceByDesktopName(QStringLiteral("konsolepart")); - Q_ASSERT(service); - KPluginFactory *factory = KPluginLoader(service->library()).factory(); - Q_ASSERT(factory); + const KPluginFactory::Result result = KPluginFactory::instantiatePlugin(KPluginMetaData(QStringLiteral("konsolepart")), this); - auto *terminalPart = factory->create(this); + Q_ASSERT(result); - return terminalPart; + return result.plugin; } QTEST_MAIN(PartManualTest) diff --git a/src/tests/demo_konsolepart/src/demo_konsolepart.cpp b/src/tests/demo_konsolepart/src/demo_konsolepart.cpp index 828aaf379..e019e7373 100644 --- a/src/tests/demo_konsolepart/src/demo_konsolepart.cpp +++ b/src/tests/demo_konsolepart/src/demo_konsolepart.cpp @@ -12,8 +12,6 @@ #include #include -#include -#include #include #include @@ -75,14 +73,12 @@ demo_konsolepart::~demo_konsolepart() KParts::ReadOnlyPart *demo_konsolepart::createPart() { - KService::Ptr service = KService::serviceByDesktopName(QStringLiteral("konsolepart")); - Q_ASSERT(service); - KPluginFactory *factory = KPluginLoader(service->library()).factory(); - Q_ASSERT(factory); + const KPluginFactory::Result result = + KPluginFactory::instantiatePlugin(KPluginMetaData(QStringLiteral("konsolepart")), this); - auto *terminalPart = factory->create(this); + Q_ASSERT(result); - return terminalPart; + return result.plugin; } void demo_konsolepart::manageProfiles()