GitLab

GIT_SILENT

GIT_SILENT

Summary:
The lambda returns a QStringBuilder which contains dangling references.
Work around that by converting to QString inside the lambda's context.

Test Plan: Does not crash anymore.

Reviewers: #plasma

Subscribers: plasma-devel

Tags: #plasma

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

GIT_SILENT

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"

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"

QT_MIN_VERSIONS is Qt 5.11 for Plasma 5.14. Agreed at kickoff meeting.  Set everywhere for clearity and consistency.

Dynamic users are getting more widely used in latest versions of systemd, and some users are reporting them showing up in SDDM. These users get an UID in the 61184–65519 range.
Lower MAX_UID to 60000 to make sure they are not displayed in SDDM by default. This also brings this value in sync with the default upstream MaximumUID

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

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"

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

GIT_SILENT

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"

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

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"

Summary:
SDDM reads files in alphabetical order from /usr/lib/sddm/sddm.conf.d/,
then /etc/sddm.conf.d/ and /etc/sddm.conf. The latest occurence takes
precedence.
The paths in CMakeLists are copied from sddm.

Test Plan: kcmshell5 kcm_sddm now shows the right preselected values.

Reviewers: #plasma, davidedmundson

Reviewed By: #plasma, davidedmundson

Subscribers: plasma-devel

Tags: #plasma

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

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"

Summary: wayland-cursor uses xcursor to load cursors, so this is fine.

Test Plan: I can select cursors on wayland again.

Reviewers: #plasma, davidedmundson

Reviewed By: #plasma, davidedmundson

Subscribers: plasma-devel

Tags: #plasma

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

Summary:
Otherwise kcm_sddm ignores values in there. Previously, a theme with a default
background image reverts to a color background on save.

Test Plan: Ran kcm_sddm and saved without changes. The background type is still image.

Reviewers: #plasma

Subscribers: plasma-devel

Tags: #plasma

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

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