Commit e3904762 authored by David Faure's avatar David Faure
Browse files

kwayland-integration: fix compilation with no-deprecated build of kwindowsystem

Summary:
I build kwindowsystem with -DEXCLUDE_DEPRECATED_BEFORE_AND_AT=5.62.0,
and this broke here. Use the exact same condition as the one around
those virtual methods in the base class.

This required upgrading the KF5 requirement from 5.62 to 5.64,
so no backport to Plasma/5.17 unfortunately.

Reviewers: kossebau, jriddell, davidedmundson

Reviewed By: kossebau

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D25488
parent d55375c0
......@@ -4,7 +4,7 @@ set(PROJECT_VERSION_MAJOR 5)
cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
set(QT_MIN_VERSION "5.12.0")
set(KF5_MIN_VERSION "5.62.0")
set(KF5_MIN_VERSION "5.64.0")
find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
......
......@@ -148,12 +148,14 @@ QPoint WindowSystem::desktopToViewport(int desktop, bool absolute)
return QPoint();
}
#if KWINDOWSYSTEM_BUILD_DEPRECATED_SINCE(5, 0)
WId WindowSystem::groupLeader(WId window)
{
Q_UNUSED(window)
qCDebug(KWAYLAND_KWS) << "This plugin does not support group leader";
return 0;
}
#endif
bool WindowSystem::icccmCompliantMappingState()
{
......@@ -519,12 +521,14 @@ QList< WId > WindowSystem::stackingOrder()
return ret;
}
#if KWINDOWSYSTEM_BUILD_DEPRECATED_SINCE(5, 0)
WId WindowSystem::transientFor(WId window)
{
Q_UNUSED(window)
qCDebug(KWAYLAND_KWS) << "This plugin does not support transient for windows";
return 0;
}
#endif
int WindowSystem::viewportToDesktop(const QPoint &pos)
{
......
......@@ -52,7 +52,7 @@ public:
void setOnAllDesktops(WId win, bool b) override;
void setOnDesktop(WId win, int desktop) override;
void setOnActivities(WId win, const QStringList &activities) override;
#ifndef KWINDOWSYSTEM_NO_DEPRECATED
#if KWINDOWSYSTEM_BUILD_DEPRECATED_SINCE(5, 0)
WId transientFor(WId window) override;
WId groupLeader(WId window) override;
#endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment