Sorry to have missed this :/

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"

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"

BUGS: 453987

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"

It's only used for the KPart

(cherry picked from commit 9eb404c3)

Albert Astals Cid authored Mar 29, 2022 and Nicolas Fella committed Apr 09, 2022

It just gives us a 48px = Large, so not worth to have that extra dependency for
that in my opinion

(cherry picked from commit ce8401e9)

Albert Astals Cid authored Mar 28, 2022 and Nicolas Fella committed Apr 09, 2022

(cherry picked from commit d8f0baa2)

M  B  authored Apr 03, 2022 and Albert Astals Cid committed Apr 04, 2022

If an image URL contains a non-ASCII character (e.g. `kartöffelchen.jpg`), the html returned by the markdown parser contains the encoded path `kart%C3%B6ffelchen.jpg`. We must decode the path before checking if the image file exists.

(cherry picked from commit 8aa96484)

Just to load an icon, we can use `QIcon::fromTheme` for that.

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"

This is part of 451985 the other part is that KF5.91 windows build of
khtml was broken, seems the 5.92 one is good, so once we release 22.04.0
it should be all good hopefully.

BUGS: 451985