Make it possible to compile 5.12 branch with a kdecoration from master
Summary: KDecoration has two new pure virtual methods. Due to that one cannot build KWin in the stable branch. This makes bug fixing rather cumbersome as one also needs to switch the kdecoration branch. This rather unusual change for a stable branch improves the compatibility by adding the new virtual methods without doing anything and without marking them as override, so that the code can compile with a kdecoration from 5.12 and a kdecoration from master. Test Plan: 5.12 branch compiles with kdecoration master branch Reviewers: #kwin, #plasma Subscribers: plasma-devel, kwin Tags: #plasma Differential Revision: https://phabricator.kde.org/D10296icc-effect-5.14.5
parent
ea5e701164
commit
8245a74b31
|
@ -200,6 +200,15 @@ QColor DecoratedClientImpl::color(KDecoration2::ColorGroup group, KDecoration2::
|
|||
return QColor();
|
||||
}
|
||||
|
||||
void DecoratedClientImpl::requestShowToolTip(const QString &text)
|
||||
{
|
||||
Q_UNUSED(text)
|
||||
}
|
||||
|
||||
void DecoratedClientImpl::requestHideToolTip()
|
||||
{
|
||||
}
|
||||
|
||||
void DecoratedClientImpl::requestShowWindowMenu()
|
||||
{
|
||||
// TODO: add rect to requestShowWindowMenu
|
||||
|
|
|
@ -72,6 +72,8 @@ public:
|
|||
bool hasApplicationMenu() const override;
|
||||
bool isApplicationMenuActive() const override;
|
||||
|
||||
void requestShowToolTip(const QString &text);
|
||||
void requestHideToolTip();
|
||||
void requestClose() override;
|
||||
void requestContextHelp() override;
|
||||
void requestToggleMaximization(Qt::MouseButtons buttons) override;
|
||||
|
|
|
@ -351,6 +351,15 @@ void PreviewClient::setBordersTopEdge(bool enabled)
|
|||
emit bordersTopEdgeChanged(enabled);
|
||||
}
|
||||
|
||||
void PreviewClient::requestShowToolTip(const QString &text)
|
||||
{
|
||||
Q_UNUSED(text)
|
||||
}
|
||||
|
||||
void PreviewClient::requestHideToolTip()
|
||||
{
|
||||
}
|
||||
|
||||
void PreviewClient::requestClose()
|
||||
{
|
||||
emit closeRequested();
|
||||
|
|
|
@ -97,6 +97,8 @@ public:
|
|||
bool hasApplicationMenu() const override;
|
||||
bool isApplicationMenuActive() const override;
|
||||
|
||||
void requestShowToolTip(const QString &text);
|
||||
void requestHideToolTip();
|
||||
void requestClose() override;
|
||||
void requestContextHelp() override;
|
||||
void requestToggleMaximization(Qt::MouseButtons buttons) override;
|
||||
|
|
Loading…
Reference in New Issue