Commit 7259c78a authored by Volker Krause's avatar Volker Krause
Browse files

Disable more deprecated fallback code paths

This allows building with KF deprecation level 5.92 or above, where we
don't have KPluginMetaData::fromDesktopFile anymore.
parent 6eb9c053
Pipeline #168681 passed with stage
in 1 minute and 21 seconds
......@@ -66,7 +66,6 @@ static KService::List listModules()
return services;
}
#endif
static KService::Ptr locateModule(const QString &module)
{
......@@ -93,6 +92,7 @@ static KService::Ptr locateModule(const QString &module)
return service;
}
#endif
bool KCMShell::isRunning()
{
......@@ -277,6 +277,7 @@ int main(int _argc, char *_argv[])
if (foundKCM) {
continue;
}
#if KCOREADDONS_BUILD_DEPRECATED_SINCE(5, 92)
KService::Ptr service = locateModule(arg);
if (!service) {
service = locateModule(QStringLiteral("kcm_") + arg);
......@@ -297,6 +298,7 @@ int main(int _argc, char *_argv[])
} else {
std::cerr << i18n("Could not find module '%1'. See kcmshell5 --list for the full list of modules.", arg).toLocal8Bit().constData() << std::endl;
}
#endif
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment