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"

Not integrated in the rest of the application yet though.

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"

For this, simplify the implementation of the notch effect at the top by
assuming a flat monochrome background and just drawing the notch on top,
rather than masking it out with an opacity mask shader effect.

This adds the correct rich text, but doesn't fix interaction yet, as the
shader effect opacity mask eats the mouse events here.

This will make it show up as application instead of System Service in the notifications KCM

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"

Android only so far, as we don't have KNotifyConfig for Plasma Mobile yet
I think. This also adds support for showing disruption notifications
on the lock screen, if supported by the platform. That depends on pending
KNotification patches though.

Unlike QAndroidIntent::putExtra, this one interoperates with Android's
types. The Qt one just serializes the value using a QDataStream and puts
that into a Java byte array, and thus is entirely useless if you want to
interact with anything not using Qt (which essentially is everything on
Android).

This avoids boilerplate code, and allows us to use properties as such
rather than representing them as functions. Read-only so far, as we only
use this for constants, but the concept should work for writable and
non-static properties as well, if we ever need that.

This however requires C++17 inline variables, which isn't a problem as we
only need this on Android, and there the compiler is new enough.

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"

At that point they provide no value anymore.

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"

Enables notification configuration on Plasma systems, and gives us more
control over the notification channel on Android.

Also, add a manual test rig for delay notifications.