mirror of
https://invent.kde.org/network/falkon.git
synced 2024-12-20 18:56:34 +01:00
Merge remote-tracking branch 'origin/Falkon/3.1'
This commit is contained in:
commit
95790ce9e5
@ -24,6 +24,7 @@
|
|||||||
|
|
||||||
class FALKON_EXPORT LocationCompleterDelegate : public QStyledItemDelegate
|
class FALKON_EXPORT LocationCompleterDelegate : public QStyledItemDelegate
|
||||||
{
|
{
|
||||||
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
explicit LocationCompleterDelegate(QObject *parent = 0);
|
explicit LocationCompleterDelegate(QObject *parent = 0);
|
||||||
|
|
||||||
|
@ -42,6 +42,7 @@ const int refreshInterval = 60 * 1000;
|
|||||||
|
|
||||||
class FCM_Button : public AbstractButtonInterface
|
class FCM_Button : public AbstractButtonInterface
|
||||||
{
|
{
|
||||||
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
explicit FCM_Button(QObject *parent = nullptr)
|
explicit FCM_Button(QObject *parent = nullptr)
|
||||||
: AbstractButtonInterface(parent)
|
: AbstractButtonInterface(parent)
|
||||||
@ -456,3 +457,5 @@ QString FCM_Plugin::extractOriginFrom(const QString &path)
|
|||||||
|
|
||||||
return origin;
|
return origin;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#include "fcm_plugin.moc"
|
||||||
|
@ -34,6 +34,7 @@
|
|||||||
|
|
||||||
class TabManagerButton : public AbstractButtonInterface
|
class TabManagerButton : public AbstractButtonInterface
|
||||||
{
|
{
|
||||||
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
explicit TabManagerButton(QObject *parent = nullptr)
|
explicit TabManagerButton(QObject *parent = nullptr)
|
||||||
: AbstractButtonInterface(parent)
|
: AbstractButtonInterface(parent)
|
||||||
@ -236,3 +237,5 @@ void TabManagerWidgetController::emitRefreshTree()
|
|||||||
{
|
{
|
||||||
emit requestRefreshTree();
|
emit requestRefreshTree();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#include "tabmanagerwidgetcontroller.moc"
|
||||||
|
@ -21,6 +21,7 @@
|
|||||||
|
|
||||||
class VerticalTabsSchemeHandler : public ExtensionSchemeHandler
|
class VerticalTabsSchemeHandler : public ExtensionSchemeHandler
|
||||||
{
|
{
|
||||||
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
explicit VerticalTabsSchemeHandler(QObject *parent = nullptr);
|
explicit VerticalTabsSchemeHandler(QObject *parent = nullptr);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user