diff --git a/src/autotests/PartTest.cpp b/src/autotests/PartTest.cpp index 18c97fb7..d19cebfc 100644 --- a/src/autotests/PartTest.cpp +++ b/src/autotests/PartTest.cpp @@ -15,11 +15,15 @@ #include // KDE #include -#include #include #include #include +#include +#if KCOREADDONS_VERSION < QT_VERSION_CHECK(5, 86, 0) +#include +#endif + // Konsole #include "../Pty.h" @@ -122,6 +126,15 @@ void PartTest::testFd(bool runShell) KParts::Part *PartTest::createPart() { +#if KCOREADDONS_VERSION >= QT_VERSION_CHECK(5, 86, 0) + const KPluginMetaData metaData(QStringLiteral("konsolepart")); + Q_ASSERT(metaData.isValid()); + + KPluginFactory::Result result = KPluginFactory::instantiatePlugin(metaData, this); + Q_ASSERT(result); + + return result.plugin; +#else auto konsolePartPlugin = KPluginLoader::findPlugin(QStringLiteral("konsolepart")); if (konsolePartPlugin.isNull()) { return nullptr; @@ -135,6 +148,7 @@ KParts::Part *PartTest::createPart() auto *terminalPart = factory->create(this); return terminalPart; +#endif } QTEST_MAIN(PartTest) diff --git a/src/autotests/TerminalInterfaceTest.cpp b/src/autotests/TerminalInterfaceTest.cpp index 890270d9..867fb770 100644 --- a/src/autotests/TerminalInterfaceTest.cpp +++ b/src/autotests/TerminalInterfaceTest.cpp @@ -17,7 +17,11 @@ // KDE #include +#include +#if KCOREADDONS_VERSION < QT_VERSION_CHECK(5, 86, 0) #include +#endif + #include using namespace Konsole; @@ -220,6 +224,15 @@ void TerminalInterfaceTest::testTerminalInterfaceV2() KParts::Part *TerminalInterfaceTest::createPart() { +#if KCOREADDONS_VERSION >= QT_VERSION_CHECK(5, 86, 0) + const KPluginMetaData metaData(QStringLiteral("konsolepart")); + Q_ASSERT(metaData.isValid()); + + KPluginFactory::Result result = KPluginFactory::instantiatePlugin(metaData, this); + Q_ASSERT(result); + + return result.plugin; +#else auto konsolePartPlugin = KPluginLoader::findPlugin(QStringLiteral("konsolepart")); if (konsolePartPlugin.isNull()) { return nullptr; @@ -233,6 +246,7 @@ KParts::Part *TerminalInterfaceTest::createPart() auto *terminalPart = factory->create(this); return terminalPart; +#endif } QTEST_MAIN(TerminalInterfaceTest)