GitLab

Luigi Baldoni authored Mar 21, 2021 and Laurent Montel committed Mar 30, 2021

BUG: 354983

(thanks @Jari Kuittinen)

GIT_SILENT: add sanitizers.supp so we can suppress some leak generated by some lib (as libfontconfig)

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 791624e2)

Lukáš Turek authored Jan 23, 2021 and Albert Astals Cid committed Feb 08, 2021

GrantleeViewFormatter converts user configured font size from points
to pixels, but there's no such conversion in AkregatorPart, where
QWebEngineSettings::setFontSize also expects the font size in pixels.
As a result fonts on sites using relative units (em or rem) are small,
unless DPI is close to 72. The point to pixel conversion should be
either in both places, or none. I chose the latter option, because
then the font sizes in Akregator match values in Falkon.

BUG: 397752

(cherry picked from commit b3be0cbf)

If you want git blame to ignore formatting revisions run: git config blame.ignoreRevsFile .git-blame-ignore-revs