GitLab

(cherry picked from commit b6c2dc68)

(cherry picked from commit df45d0cd)

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"

(cherry picked from commit 8ae6d051)

(cherry picked from commit d1f6e35c)

Volker Krause authored Jan 03, 2022 and Albert Astals Cid committed Jan 25, 2022

Makes no difference with Qt5, but required by Qt6.

(cherry picked from commit 7bb40189)

(cherry picked from commit 9ab7ba61)

(cherry picked from commit 356cd87a)

(cherry picked from commit 1c6a51b3)

(cherry picked from commit 649d62b2)

(cherry picked from commit 3e377d00)

Add version handling

Add build.gradle for apk blocklist

(cherry picked from commit 72821122)

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 7b9fb634)

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 9397d9fe)