GitLab

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

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"

Luigi Baldoni authored Jan 08, 2021 and Laurent Montel committed Jan 11, 2021

BUG: 420520

(thanks @Jari Kuittinen)

GIT_SILENT: use new cmake-3.19.0 feature. cmake --preset=dev or other it will provide correct cmake settings

(cherry picked from commit a95fd055)

Allow to use UNITY build see https://cmake.org/cmake/help/latest/prop_tgt/UNITY_BUILD.html (Reduce compile time. Need cmake 3.16.0) (disable for the moment)

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"