GitLab

Should be uncontroversial and compile time checked.

We do this sometimes, but not consistenly.

The benefit is twofold.
First it improves the diff when adding new values since no existing line needs to be touched.
Second it prevents clang-format from collapsing the definition into a single line, which is undesired for large enums.

Most of our enum declaratons are on multiple lines, but not all of them.

Expand the remaining ones to be consistent

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"

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"

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"

It contained traces of some KDE4 stuff,
an useless if statement and a bit of formatting.

With frameworks/kservice!16
and all the commits that followed we can remove this hack.

CCBUG: 398803

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"

BUG: 427824
FIXED-IN: 5.20.2

They are about to get deprecated(frameworks/krunner!40)
and the minLetterCount and matchRegex properties are already utilized.

BUG: 342876
FIXED-IN: 5.21

We already find KCMs explicitly

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"

FEATURE: 423003
FIXED-IN: 5.21

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"

This caused a lot of CPU load, because the applets were listed and filtered for each letter typed. Now they are only listed when the match() method is called for the first time and reused for the rest of the match session.

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"

David Edmundson authored Sep 28, 2020 and Henri Chain committed Sep 29, 2020

This means on logout we'll be gracefully closed down.

All of these are closing down properly anyway, but this makes things a
bit more explicit in case you managed to log out at an awkward point.

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"