Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Education
Minuet
Commits
d5a8e592
Commit
d5a8e592
authored
Jul 12, 2022
by
Nicolas Fella
Browse files
Port away from deprecated KPluginLoader
parent
536d7661
Pipeline
#204354
passed with stage
in 1 minute and 8 seconds
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
d5a8e592
...
...
@@ -14,7 +14,7 @@ set (MINUET_VERSION "0.4.0.${RELEASE_SERVICE_COMPACT_VERSION}")
project
(
minuet VERSION
${
MINUET_VERSION
}
)
set
(
KF5_MIN_VERSION
"5.
15
.0"
)
set
(
KF5_MIN_VERSION
"5.
86
.0"
)
set
(
QT_MIN_VERSION
"5.7.0"
)
find_package
(
ECM
${
KF5_MIN_VERSION
}
CONFIG REQUIRED
)
...
...
src/app/plugincontroller.cpp
View file @
d5a8e592
...
...
@@ -32,7 +32,8 @@
#include
<interfaces/isoundcontroller.h>
#if !defined(Q_OS_ANDROID)
#include
<KPluginLoader>
#include
<QPluginLoader>
#include
<KPluginMetaData>
#endif
#include
<QDebug>
...
...
@@ -42,7 +43,7 @@ namespace Minuet
PluginController
::
PluginController
(
QObject
*
parent
)
:
IPluginController
(
parent
)
{
#if !defined(Q_OS_ANDROID)
m_plugins
=
KPlugin
Loader
::
findPlugins
(
QStringLiteral
(
"minuet"
));
m_plugins
=
KPlugin
MetaData
::
findPlugins
(
QStringLiteral
(
"minuet"
));
#endif
}
...
...
@@ -65,7 +66,7 @@ bool PluginController::initialize(Core *core)
continue
;
}
K
PluginLoader
loader
(
pluginMetaData
.
fileName
());
Q
PluginLoader
loader
(
pluginMetaData
.
fileName
());
IPlugin
*
plugin
=
qobject_cast
<
IPlugin
*>
(
loader
.
instance
());
if
(
plugin
)
{
m_loadedPlugins
.
insert
(
pluginMetaData
,
plugin
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment