kdf already depends on KDE Frameworks >= 5.70.

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"

Matej Mrenica authored May 05, 2020 and Nate Graham committed May 05, 2020

Summary: When using fractional scaling, some icons are blurred. This patch fixes the issue.

Test Plan:
No side effects.

Before:
{F8287226}
After:
{F8287229}

Reviewers: #kde_applications, ngraham

Reviewed By: #kde_applications, ngraham

Subscribers: kde-utils-devel

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

Test Plan: kwikdisk, systray icon context menu, "start kdiskfree", works

qCDebug() will add a newline at the end anyway.

CCMAIL:montel@kde.org

GIT_SILENT

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"