GitLab

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"

Improves looks and performance. Previously we had a single cache of icon
pixmaps in Manager. Manager always loaded 64x64 icons, even if the theme
was using 16x16 (which is the default). That resulted in ugly icons, both
due to down-scaling while rendering, and because we were using icons
designed to be shown as 64x64, not 16x16 or similar. This change moves
the pixmap cache to Theme, so that each Theme has its own cache using
the Theme's icon sizes. The cache is populated lazily, so unused
themes don't waste memory with cache.

It also slightly improves performance, because the pixmaps don't have
to be scaled down when rendering.

It's used by Akregator

mode

=> avoid to export some class when we build in release mode

Summary:
Now messagefactorytest passes. Please check if this is the correct expected value though.
I just noticed that this test is gone in master though, messagefactorytest being rewritten?

Test Plan: ctest -R messagefactorytest

Reviewers: mlaurent

Reviewed By: mlaurent

Subscribers: #kde_pim

Tags: #kde_pim

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

this autotest
CCMAIL: faure@kde.org