Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 18:56:34 +01:00
Code Releases Activity

QmlPlugin: Change entrypoint to always be main.qml

Browse Source
This commit is contained in:
David Rosca 2019-04-18 11:52:44 +02:00
parent 7a562a4847
commit 13449605eb
No known key found for this signature in database
GPG Key ID: EBC3FC294452C6D8
5 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lib/plugins/qml/qmlplugin.cpp
View File

@ -53,8 +53,7 @@ Plugins::Plugin QmlPlugin::loadPlugin(const QString &name)
plugin.pluginPath = fullPath; plugin.pluginPath = fullPath;
DesktopFile desktopFile(fullPath + QSL("/metadata.desktop")); DesktopFile desktopFile(fullPath + QSL("/metadata.desktop"));
plugin.pluginSpec = Plugins::createSpec(desktopFile); plugin.pluginSpec = Plugins::createSpec(desktopFile);
QString entryPoint = desktopFile.value(QSL("X-Falkon-EntryPoint")).toString(); plugin.data = QVariant::fromValue(new QmlPluginLoader(plugin.pluginSpec.name, fullPath));
plugin.data = QVariant::fromValue(new QmlPluginLoader(plugin.pluginSpec.name, fullPath, entryPoint));
return plugin; return plugin;
} }

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

@ -25,11 +25,10 @@
#include "qml/api/i18n/qmli18n.h" #include "qml/api/i18n/qmli18n.h"
#endif #endif
QmlPluginLoader::QmlPluginLoader(const QString &name, const QString &path, const QString &entryPoint) QmlPluginLoader::QmlPluginLoader(const QString &name, const QString &path)
{ {
m_name = name; m_name = name;
m_path = path; m_path = path;
m_entryPoint = entryPoint;
initEngineAndComponent(); initEngineAndComponent();
} }
@ -63,7 +62,7 @@ QmlPluginInterface *QmlPluginLoader::instance() const
void QmlPluginLoader::initEngineAndComponent() void QmlPluginLoader::initEngineAndComponent()
{ {
m_engine = new QmlEngine(); m_engine = new QmlEngine();
m_component = new QQmlComponent(m_engine, QDir(m_path).filePath(m_entryPoint)); m_component = new QQmlComponent(m_engine, QDir(m_path).filePath(QStringLiteral("main.qml")));
m_engine->setExtensionPath(m_path); m_engine->setExtensionPath(m_path);
m_engine->setExtensionName(m_name); m_engine->setExtensionName(m_name);
#if HAVE_LIBINTL #if HAVE_LIBINTL

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

@ -29,14 +29,13 @@ class QmlPluginLoader : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit QmlPluginLoader(const QString &name, const QString &path, const QString &entryPoint); explicit QmlPluginLoader(const QString &name, const QString &path);
void createComponent(); void createComponent();
QQmlComponent *component() const; QQmlComponent *component() const;
QmlPluginInterface *instance() const; QmlPluginInterface *instance() const;
private: private:
QString m_path; QString m_path;
QString m_name; QString m_name;
QString m_entryPoint;
QmlEngine *m_engine = nullptr; QmlEngine *m_engine = nullptr;
QQmlComponent *m_component = nullptr; QQmlComponent *m_component = nullptr;
QmlPluginInterface *m_interface = nullptr; QmlPluginInterface *m_interface = nullptr;

0
src/scripts/helloqml/helloqml.qml → src/scripts/helloqml/main.qml
View File

1
src/scripts/helloqml/metadata.desktop
View File

@ -49,4 +49,3 @@ X-Falkon-Author=Anmol Gautam
X-Falkon-Email=tarptaeya@gmail.com X-Falkon-Email=tarptaeya@gmail.com
X-Falkon-Version=0.1.0 X-Falkon-Version=0.1.0
X-Falkon-Settings=true X-Falkon-Settings=true
X-Falkon-EntryPoint=helloqml.qml