GitLab

(cherry picked from commit 8766e165)

(cherry picked from commit 0312636a)

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"

(cherry picked from commit 1cb5f1c9)

They do not belong to an user-facing documentation, but rather to
separate download/build development pages.

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"

(cherry picked from commit b1b5a2e8)

(cherry picked from commit 1cf5ba81)

Summary: When using fractional scaling, icons on the top are blurred. This patch fixes the issue.

Test Plan: No side effects.

Reviewers: #kde_games, yurchor

Reviewed By: yurchor

Subscribers: yurchor, kde-games-devel

Differential Revision: https://phabricator.kde.org/D29649

(cherry picked from commit 2da8f694)

By just using the default background instead of trying to give it one and trust the default color scheme looks good enough

BUGS: 411083

By just providing default operators explicitely that work for these classes

https://marc.info/?l=kde-core-devel&m=158043297319851&w=2