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"

GIT_SILENT

Otherwise kwin gets a window opening and gets confused.

It's supposed to occupy the entire screen area and should only be seen
for a few seconds at most. There's no reason to keep the decoration.

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"

We can keep using StartupFeedback.open but this allows us to show the
notifications also when a process that isn't necessarily the shell
starts.

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"

Aleix Pol Gonzalez authored Jun 10, 2021 and Aleix Pol Gonzalez committed Jun 11, 2021

/lib64/qml/org/kde/plasma/private/nanoshell/qml/StartupFeedback.qml:108
ReferenceError: fill is not defined

There's no fill object (anymore?), just drop it.

Aleix Pol Gonzalez authored Jun 10, 2021 and Aleix Pol Gonzalez committed Jun 11, 2021

As done in the rest of Plasma, as it should be towards Qt 6.

even with maximizing as policy, dialog windows are not guaranteed
to be maximized by kwin
https://invent.kde.org/plasma/plasma-phone-components/-/issues/89

GIT_SILENT