mirror of
https://invent.kde.org/network/falkon.git
synced 2024-11-11 01:22:10 +01:00
Merge branch 'Falkon/3.1'
This commit is contained in:
commit
2d5bf8d45f
|
@ -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()) {
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue
Block a user