GitLab

(cherry picked from commit 4273558d)

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"

Nicolas Fella authored Apr 30, 2022 and Albert Astals Cid committed May 02, 2022

It was never finished and hasn't seen active progress in 10 years

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"

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"

Alexander Lohnau authored Apr 16, 2022 and Albert Astals Cid committed Apr 18, 2022

Define X-KDE-KRDC-Sorting values as number, utilize KPluginMetaData::value to avoid conversion warnings

Alexander Lohnau authored Apr 16, 2022 and Albert Astals Cid committed Apr 18, 2022

We do not care about the version and ignore the servicetype when querying the plugin

Task: https://phabricator.kde.org/T14730

Alexander Lohnau authored Apr 16, 2022 and Albert Astals Cid committed Apr 18, 2022

Task: https://phabricator.kde.org/T14564

Antenore Gatta authored Apr 18, 2022 and Albert Astals Cid committed Apr 18, 2022

This patch replaces:

* vsprintf with vasprintf.
* functions like `QApplication::desktop()->screenGeometry()`

I've done some tests, and it seems to work properly.

As mentioned at #4 (comment 433301) there are some use cases that need attention, but it shouldn't be done in the scope of this MR as the problem exists as well with the deprecated functions.

(cherry picked from commit 66b02bc8)

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"

(cherry picked from commit 4a1fdb09)

(cherry picked from commit 07684030)

This way we do not need to explicitly specify the factory name.

Also we do not need to embed the json metadata.

(cherry picked from commit 07e3f4da)

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"

(cherry picked from commit 7d80162c)