Merge branch 'Plasma/5.17'

This commit is contained in:
Roman Gilg 2019-10-13 15:54:26 -04:00
commit 4cd6f9428f

View file

@ -634,6 +634,9 @@ bool DrmOutput::dpmsLegacyApply()
return true;
}
// TODO: Rotation is currently broken in the DRM backend for 90° and 270°. Disable all rotation for
// now to not break user setups until it is possible again.
#if 0
void DrmOutput::transform(KWayland::Server::OutputDeviceInterface::Transform transform)
{
waylandOutputDevice()->setTransform(transform);
@ -711,6 +714,12 @@ void DrmOutput::transform(KWayland::Server::OutputDeviceInterface::Transform tra
// TODO: are these calls not enough in updateMode already?
setWaylandMode();
}
#else
void DrmOutput::transform(KWayland::Server::OutputDeviceInterface::Transform transform)
{
Q_UNUSED(transform)
}
#endif
void DrmOutput::updateMode(int modeIndex)
{