GitLab

(cherry picked from commit 30391af8)

(cherry picked from commit 57c9caa6)

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 756797ec)

(cherry picked from commit 064a1263)

BUG: 418444

(cherry picked from commit 3cedf821)

Summary: Thanks Laurent for writing that class :-)

Test Plan: File dialog looks good again. Tested saving a 8-bit PNG, worked.

Reviewers: tcanabrava, broulik, pino, andreagenor

Reviewed By: broulik

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

aboutData.setupCommandLine already sets them so no need to set them
manually

Reviewers: nicolasfella

Reviewed By: nicolasfella

Maniphest Tasks: T11637

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

GIT_SILENT

Summary: This was the final step to port away from kdelibs4support.

Test Plan: The print dialog still has the 3rd widget with 2 radiobuttons like before.

Reviewers: broulik, andreagenor, tcanabrava, vkrause

Reviewed By: vkrause

Maniphest Tasks: T11576

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