GitLab

(cherry picked from commit d4d40062)

It breaks launching the application on Wayland

We ignore the name/description and only display the id in the ui.
To make sure the is are the same, the OUTPUT_NAME cmake target property is set.
Otherwise, we would need a json file with the KPlugin object and then the id in it, which is
unnecessary work for sth. that can be done in a single line.

Having the file base name and id differ is also discouraged, see https://phabricator.kde.org/T14499

We have one defined in the base class, consequently we do not violate the rule of life when removing the empty ones

This way we do not need to take care of setting the factory name and typing out the registration manually

- We do not need to manually check for duplicates
- Improve the error message while at it
- Remove the internal utility-method since the code is super small now

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"

Converting a servicetype to json does not make sense and we do not use the file anywhere.
With us also not using KServiceTypeTrader for the plugin loading, we can get rid of the servicetype desktop files.

(cherry picked from commit b2e736c2)

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"

Andreas Sturmlechner authored Mar 24, 2022 and Alexey Min committed Mar 24, 2022

We have an option so let's be consistent.
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

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 ef32c926)

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 fa7bbbc8)

Alexey Min authored Dec 24, 2021 and Albert Astals Cid committed Jan 11, 2022

Fixes thigs like:
warning: ‘static QVector<KPluginMetaData> KPluginLoader::findPlugins(
  const QString&, std::function<bool(const KPluginMetaData&)>)’
  is deprecated: Since 5.86.
  Use KPluginMetaData::findPlugins instead [-Wdeprecated-declarations]

It is possible to have zero data in the buffer, but have the
buffer to carry metadata about the mouse cursor. In that case
we should try to process the cursor metadata before we discard
the buffer for not having any data.

(cherry picked from commit 1d5bf084)

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"

mark VirtualMonitorRfbServer:newClient() as oveeride

fixes warning:
krfb/main-virtualmonitor.cpp:67:23: warning:
 ‘virtual PendingRfbClient* VirtualMonitorRfbServer::newClient(rfbClientPtr)’
 can be marked override [-Wsuggest-override]
   67 |     PendingRfbClient *newClient(rfbClientPtr client) {
      |                       ^~~~~~~~~

(cherry picked from commit 39b068b1)

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"