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

Merge branch 'Falkon/3.1'

Browse Source
This commit is contained in:
David Rosca 2019-04-18 10:24:47 +02:00
commit e44ba37063
No known key found for this signature in database
GPG Key ID: EBC3FC294452C6D8
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/KDEFrameworksIntegration/kdeframeworksintegrationplugin.cpp
View File

@ -39,12 +39,7 @@
KDEFrameworksIntegrationPlugin::KDEFrameworksIntegrationPlugin() KDEFrameworksIntegrationPlugin::KDEFrameworksIntegrationPlugin()
: QObject() : QObject()
, m_backend(0)
, m_sharePageMenu(new Purpose::Menu())
{ {
m_sharePageMenu->setTitle(tr("Share page"));
m_sharePageMenu->setIcon(QIcon::fromTheme(QStringLiteral("document-share")));
m_sharePageMenu->model()->setPluginType(QStringLiteral("ShareUrl"));
} }
DesktopFile KDEFrameworksIntegrationPlugin::metaData() const DesktopFile KDEFrameworksIntegrationPlugin::metaData() const
@ -76,6 +71,11 @@ void KDEFrameworksIntegrationPlugin::init(InitState state, const QString &settin
WebPage::addSupportedScheme(protocol); WebPage::addSupportedScheme(protocol);
} }
m_sharePageMenu = new Purpose::Menu();
m_sharePageMenu->setTitle(tr("Share page"));
m_sharePageMenu->setIcon(QIcon::fromTheme(QStringLiteral("document-share")));
m_sharePageMenu->model()->setPluginType(QStringLiteral("ShareUrl"));
KAboutData aboutData(QSL("falkon"), QSL("Falkon"), QCoreApplication::applicationVersion()); KAboutData aboutData(QSL("falkon"), QSL("Falkon"), QCoreApplication::applicationVersion());
KAboutData::setApplicationData(aboutData); KAboutData::setApplicationData(aboutData);

4
src/plugins/KDEFrameworksIntegration/kdeframeworksintegrationplugin.h
View File

@ -40,7 +40,7 @@ public:
void populateWebViewMenu(QMenu *menu, WebView *view, const WebHitTestResult &r) override; void populateWebViewMenu(QMenu *menu, WebView *view, const WebHitTestResult &r) override;
private: private:
KWalletPasswordBackend* m_backend; KWalletPasswordBackend *m_backend = nullptr;
QVector<KIOSchemeHandler*> m_kioSchemeHandlers; QVector<KIOSchemeHandler*> m_kioSchemeHandlers;
Purpose::Menu *m_sharePageMenu; Purpose::Menu *m_sharePageMenu = nullptr;
}; };