GitLab

(cherry picked from commit ba1bb4e7)

7004906e started to use targets instead
of sources variables, but missed a few spots, which caused the build to
fail.
ecm_add_app_icon(<target> ...) is only available since 5.83.0.

CCMAIL: montel@kde.org

(cherry picked from commit ad1db748)

(cherry picked from commit 98625346)

(cherry picked from commit 2ee52583)

(cherry picked from commit 645f2bd7)

(cherry picked from commit db28a8f1)

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 28a72c10)

(cherry picked from commit bffab95e)

(cherry picked from commit 69a5ad7f)

(cherry picked from commit e15674e4)

(cherry picked from commit 3ae7a5e9)

Alex, Laurent, please remember to do the merges form stable to master
if it wasn't because I'm stubborn when creating new branches
we would have lost this for 20.08 and future
because the code was only in 20.04

CCMAIL: alexander.lohnau@gmx.de
CCMAIL: montel@kde.org

(cherry picked from commit a53da18e)

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"