GitLab

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Here we want to only include values if they are in the file.
The default values are applied in readInGlobalPartFromInfo.

We're more used to the "21:9" aspect ratio; "64:27" seems strange to users.

The intent here is to impact the position of screens around a given
screen when its size changes. This way we avoid weird overlaps or gaps
on resize with the screens snapped to a given one.

Note that even though it'll fully respect snapping in one direction,
it won't respect snapping between other screens in different directions.
This would require a full fledged layout engine which would be
complicated to grow in the current model.

Since it's also a less common case, I chose to ignore it. Let's make it
work for the 80% of the cases which are generally in one direction only.

With an spacing value = 0, the second delegate of the SwipeView
will be visible in the right margin region of the first delegate.

This shows up mainly when the FormLayout goes into narrow mode,
since then the items are left aligned and more likely to get into
the visible part.

CCBUG: 434383

This can be useful for hardware vendors to set a default
configuration. One example could be setting the scale on a
phone to 2 or rotating an output that is installed rotated.
Settings stored in the local directory still take precedence.

It was only useful for the test which we can handle with
manually setting XDG_DATA_HOME.

If we already have global settings for this output, we either ran
the generator for this output so we don't need to find out the best
mode and scale again. Or the user manually changed the config and
selected "For any display arrangement" when saving so we should use
those values here. For example a rotated screen will now stay rotated
in a new config too.

At least the tests after them will be run again.

If the slider row is set to fillWidth, then the slider from the first
delegate can overlap the slider of the second delegate. Limit the size
to the same amount as the Device combobox.

BUG: 434383
FIXED-IN: 5.22

As discussed in https://mail.kde.org/pipermail/plasma-devel/2021-February/119329.html

GIT_SILENT

We need to pass the action id instead of the button's action object

BUG: 432481

Port from phabricator to gitlab
Adapt to changed Plasma branching strategy
Remove specific commit message policy. kscreen follows Plasma policies and
Plasma does not have a specific commit message policy other than KDE's.

kded5 spammed "file:///usr/share/kded_kscreen/qml/OsdSelector.qml:57:21: Unable to assign int to QQuickAction*"...
CCMAIL:uhhadd@gmail.com

The issue has been resolved

Given that kscreen and libkscreen are developed and released together
it's reasonable to assume/require that kscreen is built against
libkscreen of the same version

After plasma/libkscreen!12 rotation direction changed, so we need to fix
this as well.

This makes it easier to build against both Qt5 and Qt6

GIT_SILENT

Otherwise with really long display names, it can blow up the layout.

BUG: 432249
FIXED-IN: 5.21

GIT_SILENT

GIT_SILENT

GIT_SILENT

If you want git blame to ignore formatting revisions run:
git config blame.ignoreRevsFile .git-blame-ignore-revs

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"