mirror of
https://invent.kde.org/network/falkon.git
synced 2024-12-20 10:46:35 +01:00
Merge branch 'Falkon/3.1'
This commit is contained in:
commit
e44ba37063
@ -39,12 +39,7 @@
|
||||
|
||||
KDEFrameworksIntegrationPlugin::KDEFrameworksIntegrationPlugin()
|
||||
: 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
|
||||
@ -76,6 +71,11 @@ void KDEFrameworksIntegrationPlugin::init(InitState state, const QString &settin
|
||||
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::setApplicationData(aboutData);
|
||||
|
||||
|
@ -40,7 +40,7 @@ public:
|
||||
void populateWebViewMenu(QMenu *menu, WebView *view, const WebHitTestResult &r) override;
|
||||
|
||||
private:
|
||||
KWalletPasswordBackend* m_backend;
|
||||
KWalletPasswordBackend *m_backend = nullptr;
|
||||
QVector<KIOSchemeHandler*> m_kioSchemeHandlers;
|
||||
Purpose::Menu *m_sharePageMenu;
|
||||
Purpose::Menu *m_sharePageMenu = nullptr;
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user