As now recommended, to ensure all locale settings are done from Qt side

official Plasma 5.12 deps

GIT_SILENT

This broke with the introduction of scroll bars around the KCM as the widget is a QScrollArea nowadays.

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

GIT_SILENT

GIT_SILENT

Ensure pixmaps are crisp on high dpi screens

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

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"

GIT_SILENT

GIT_SILENT

Summary:
also when opening modules with kcmshell (used a lot with krunner)
the statistics need to be updated to keep the list on systemsettings startup
up to date and have complete usage data of kcm modules

Test Plan:
opened systemsettings and a module with kcmsell, the list gets updated
on the fly

Reviewers: #plasma, davidedmundson

Reviewed By: #plasma, davidedmundson

Subscribers: davidedmundson, plasma-devel

Tags: #plasma

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

GIT_SILENT

GIT_SILENT

Avoid the conflict with their still-shipped counterparts from
kdelibs and kde-runtime.