GitLab

BUG: 427745

GIT_SILENT

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"

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"

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"

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"

GIT_SILENT

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"

Middle click is used to toggle an action on other applets that have more
interactive popups, by supporting both nightcolor applet stays
consistent.

BUG: 426428

We agreed to use C++17 in Plasma. Document this decision here

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"

Commit 6e6c5707 made it so that "1/2" gets correctly rejected
(used to match in certain locales such as German), but broke
unit tests by matching invalid fraction queries like "4/4>mm".

With this commit, both of these invalid queries get rejected.
Also adding more fraction tests with units left out.

kdeds subdir was dropped in commit e6472153


but not the dependency that was originally introduced with it.
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

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"

The whole concept is almost unused and there's no point in having it there but empty

See also https://phabricator.kde.org/T13553

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"

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"

licensing clarified over mail as GPL-2.0-or-later

https://mail.kde.org/pipermail/plasma-devel/2020-August/118178.html

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"

The remaining things that cannot be easily ported yet are marked as such
in the import lines so you can run `grep "org.kde.plasma.components 2.0"`
in the repo to easily see what they are.

Everything is tested and there are no regressions.

BUG: 424349

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"

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"

it's easier on the eyes and also works properly... because of how
configs
can cascade across multiple directories the previous fixed path lookup
wasn't all that correct. e.g. initially no file would be found at all,
and
when found it may not actually be the one in the user's home but e.g.
in /etc/xdg

this changes initialization to be lazyly done. we'll now always read the
config first and only if the config actually uses potd we'll initialize
a consumer. this effectively reduces the by-default weight of this
module
to a kdirwatch only

more compliant with present licensing policy

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"

This completes the work started in 16ff74c0 and uses standard sizes for
everything else that's currently hardcoded. The result is not as
dramatic, but it fixes all remaining minor visual glitches when using a
high DPI screen.

This makes them high DPI compatible instantly as those constants are
themselves high DPI compatible. It's always better to use them rather
than specifying hardcoded integer sizes.

BUG: 422547
FIXED-IN: 5.19.3

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"

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"

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"

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"