Port away from KPluginMetaData::instantiate
It's deprecated according to the documentation, QPluginLoader works just as well (it's what kcoreaddons was using anyway).
This commit is contained in:
parent
7ffd72cbfa
commit
35ec9b87a7
1 changed files with 4 additions and 1 deletions
|
@ -583,7 +583,8 @@ QProcessEnvironment Application::processStartupEnvironment() const
|
||||||
void Application::initPlatform(const KPluginMetaData &plugin)
|
void Application::initPlatform(const KPluginMetaData &plugin)
|
||||||
{
|
{
|
||||||
Q_ASSERT(!m_platform);
|
Q_ASSERT(!m_platform);
|
||||||
m_platform = qobject_cast<Platform *>(plugin.instantiate());
|
QPluginLoader loader(plugin.fileName());
|
||||||
|
m_platform = qobject_cast<Platform *>(loader.instance());
|
||||||
if (m_platform) {
|
if (m_platform) {
|
||||||
m_platform->setParent(this);
|
m_platform->setParent(this);
|
||||||
// check whether it needs libinput
|
// check whether it needs libinput
|
||||||
|
@ -598,6 +599,8 @@ void Application::initPlatform(const KPluginMetaData &plugin)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Q_EMIT platformCreated();
|
Q_EMIT platformCreated();
|
||||||
|
} else {
|
||||||
|
qCWarning(KWIN_CORE) << "Could not create plugin" << plugin.name() << "error:" << loader.errorString();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue