Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 01:22:10 +01:00
Code Releases Activity

delete engine on qml-pluign unload

Browse Source
This commit is contained in:
Anmol Gautam 2018-06-12 13:52:16 +05:30
parent d4aa875fa6
commit 3b769f82d6
4 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/lib/plugins/qml/qmlplugininterface.cpp
View File

@ -48,6 +48,7 @@ void QmlPluginInterface::unload()
}
m_jsUnload.call();
emit qmlPluginUnloaded();
}
bool QmlPluginInterface::testPlugin()

3
src/lib/plugins/qml/qmlplugininterface.h
View File

@ -40,6 +40,9 @@ public:
bool testPlugin();
void setName(const QString &name);
Q_SIGNALS:
void qmlPluginUnloaded();
private:
QString m_name;
QJSValue m_jsInit;

9
src/lib/plugins/qml/qmlpluginloader.cpp
View File

@ -19,13 +19,20 @@
QmlPluginLoader::QmlPluginLoader(const QString &path)
{
m_path = path;
m_engine = new QQmlEngine();
m_component = new QQmlComponent(m_engine, path);
m_component = new QQmlComponent(m_engine, m_path);
}
void QmlPluginLoader::createComponent()
{
m_interface = qobject_cast<QmlPluginInterface*>(m_component->create());
connect(m_interface, &QmlPluginInterface::qmlPluginUnloaded, this, [this]{
delete m_component;
delete m_engine;
m_engine = new QQmlEngine();
m_component = new QQmlComponent(m_engine, m_path);
});
}
QQmlComponent *QmlPluginLoader::component() const

4
src/lib/plugins/qml/qmlpluginloader.h
View File

@ -22,8 +22,9 @@
#include "qmlplugininterface.h"
class QmlPluginLoader
class QmlPluginLoader : public QObject
{
Q_OBJECT
public:
explicit QmlPluginLoader(const QString &path);
void createComponent();
@ -31,6 +32,7 @@ public:
QmlPluginInterface *instance() const;
void setName(const QString &name);
private:
QString m_path;
QQmlEngine *m_engine;
QQmlComponent *m_component;
QmlPluginInterface *m_interface;