Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
Akonadi Data Import Wizard
Commits
8d672bbd
Commit
8d672bbd
authored
Aug 19, 2021
by
Laurent Montel
😁
Browse files
Fix instanciate plugins
parent
a7d25ad2
Pipeline
#75625
passed with stage
in 7 minutes and 41 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/importmailpluginmanager.cpp
View file @
8d672bbd
...
...
@@ -57,6 +57,7 @@ bool ImportMailPluginManager::initializePluginList()
// 2) look at if plugin is activated
info
.
metaDataFileNameBaseName
=
QFileInfo
(
data
.
fileName
()).
baseName
();
info
.
metaDataFileName
=
data
.
fileName
();
info
.
data
=
data
;
if
(
pluginVersion
()
==
data
.
version
())
{
info
.
plugin
=
nullptr
;
mPluginList
.
push_back
(
info
);
...
...
@@ -74,8 +75,8 @@ bool ImportMailPluginManager::initializePluginList()
void
ImportMailPluginManager
::
loadPlugin
(
ImportMailPluginManagerInfo
*
item
)
{
#if KCOREADDONS_VERSION > QT_VERSION_CHECK(5, 85, 0)
const
auto
loadResult
=
KPluginFactory
::
instantiatePlugin
<
LibImportWizard
::
AbstractImporter
>
(
KPluginMetaData
(
item
->
metaDataFileName
)
,
this
);
i
f
(
loadResult
)
{
if
(
auto
plugin
=
KPluginFactory
::
instantiatePlugin
<
LibImportWizard
::
AbstractImporter
>
(
item
->
data
,
this
,
QVariantList
()
<<
item
->
metaDataFileName
)
.
plugin
)
{
i
tem
->
plugin
=
plugin
;
mPluginDataList
.
append
(
item
->
pluginData
);
}
#else
...
...
src/importmailpluginmanager.h
View file @
8d672bbd
...
...
@@ -36,6 +36,7 @@ public:
QString
metaDataFileNameBaseName
;
QString
metaDataFileName
;
PluginUtilData
pluginData
;
KPluginMetaData
data
;
LibImportWizard
::
AbstractImporter
*
plugin
=
nullptr
;
};
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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