1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 02:36:34 +01:00

Merge branch 'Falkon/3.1'

This commit is contained in:
David Rosca 2019-10-31 11:23:40 +01:00
commit 2d5bf8d45f
No known key found for this signature in database
GPG Key ID: EBC3FC294452C6D8
2 changed files with 2 additions and 2 deletions

View File

@ -82,7 +82,7 @@ void pyfalkon_register_plugin(PluginInterface *plugin)
pluginInterface = plugin;
}
Plugins::Plugin *pyfalkon_load_plugin(const QString &name)
void *pyfalkon_load_plugin(const QString &name)
{
QString fullPath;
if (QFileInfo(name).isAbsolute()) {

View File

@ -21,5 +21,5 @@
void pyfalkon_register_plugin(PluginInterface *plugin);
extern "C" Q_DECL_EXPORT Plugins::Plugin *pyfalkon_load_plugin(const QString &name);
extern "C" Q_DECL_EXPORT void *pyfalkon_load_plugin(const QString &name);
extern "C" Q_DECL_EXPORT void pyfalkon_init_plugin(Plugins::Plugin *plugin);