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

Authored by dfaure on Nov 23 2019, 12:12 PM.

Details

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.

Diff Detail

Repository
R130 Frameworks integration plugin using KWayland
Branch
master
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 19088
Build 19106: arc lint + arc unit
dfaure created this revision.Nov 23 2019, 12:12 PM
Restricted Application added a project: Plasma. · View Herald TranscriptNov 23 2019, 12:12 PM
Restricted Application added a subscriber: plasma-devel. · View Herald Transcript
dfaure requested review of this revision.Nov 23 2019, 12:12 PM
kossebau accepted this revision.Nov 23 2019, 10:57 PM

For a backport, one could perhaps do this after the includes:

#fndef KWINDOWSYSTEM_BUILD_DEPRECATED_SINCE
#ifndef KWINDOWSYSTEM_NO_DEPRECATED
#define KWINDOWSYSTEM_BUILD_DEPRECATED_SINCE(x, y) 1
#else
#define KWINDOWSYSTEM_BUILD_DEPRECATED_SINCE(x, y) 0
#endif
#endif

Otherwise seems fine with me from pure patch reading.

This revision is now accepted and ready to land.Nov 23 2019, 10:57 PM
dfaure closed this revision.Nov 23 2019, 11:36 PM