sysadmin/release-tools!27



Signed-off-by: Carl Schwan <carl@carlschwan.eu>

Signed-off-by: Carl Schwan <carl@carlschwan.eu>

This should fix the binary factory build, but it unfortunately not backward
compatible below Qt 5.15.8. Qt 6 will need the same changes anyway, so it's
not all bad at least.

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"

Bhushan Shah authored Nov 30, 2022 and Bhushan Shah committed Nov 30, 2022

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"

No Android yet, that needs further adjustments