tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3099 commits 81 branches 117 tags 12 MiB
Commit graph

1072 commits

Author SHA1 Message Date
l10n daemon script
10de7b3763 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-07-23 09:50:37 +02:00
l10n daemon script
f212df93b6 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-07-22 10:44:43 +02:00
l10n daemon script
ef73ce6f62 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-07-22 06:06:44 +02:00
l10n daemon script
c74fbacc3e SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-07-15 09:16:59 +02:00
l10n daemon script
d81a137682 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-07-15 05:44:49 +02:00
l10n daemon script
3f1978810c SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-07-14 09:16:34 +02:00
l10n daemon script
66ebeb57f7 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-07-13 09:04:59 +02:00
l10n daemon script
58d35ec881 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-07-13 05:32:17 +02:00
Aniket Kumar
af8a5bc49b Enabled seding of multi-target messages in SMS app. 2020-07-08 14:23:13 +05:30
l10n daemon script
0c32010a28 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-07-06 05:30:08 +02:00
Nicolas Fella
48688b3ef4 Merge branch 'release/20.04' 2020-07-05 15:52:44 +02:00
Nicolas Fella
bc5863f68f Add explanatory comment 2020-07-05 15:52:17 +02:00
Nicolas Fella
c8a87db367 Merge branch 'release/20.04' 2020-07-05 15:49:58 +02:00
Fabian Vogt
b699372d38 Prefer qdbus-qt5 if found 
On some distros, this is how qdbus is called to allow for coinstallability
with Qt 4 and Qt 6+.
 2020-07-05 13:45:28 +00:00
l10n daemon script
aef817e786 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-07-02 05:57:52 +02:00
l10n daemon script
588c01eb0f SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-06-27 05:41:57 +02:00
l10n daemon script
e44e4a4c19 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-06-20 05:10:40 +02:00
l10n daemon script
373557cd26 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-06-18 08:27:38 +02:00
l10n daemon script
653a708727 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-06-18 05:39:20 +02:00
l10n daemon script
5fe8d7ea90 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-06-17 16:50:11 +02:00
l10n daemon script
e873eddcde SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-06-17 14:06:59 +02:00
l10n daemon script
0e33224079 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-06-11 05:34:59 +02:00
l10n daemon script
f7c27e6faf SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-06-08 05:12:17 +02:00
l10n daemon script
046a572542 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-06-07 08:58:38 +02:00
l10n daemon script
6f39937e75 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-06-07 05:04:18 +02:00
l10n daemon script
e338309ef5 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-06-06 05:03:00 +02:00
l10n daemon script
8eee929e22 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-06-05 05:03:19 +02:00
l10n daemon script
f31dc37481 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-06-04 05:10:21 +02:00
l10n daemon script
99f0428c31 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-06-03 09:16:30 +02:00
l10n daemon script
2e5a62cc66 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-06-03 05:21:06 +02:00
l10n daemon script
84072ff32d SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-06-02 05:19:27 +02:00
l10n daemon script
7806fe73cf SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-06-01 05:51:26 +02:00
Jun Bo Bi
4c011458c2 Add real support for mpriscontrol on Windows 2020-05-31 15:50:56 -04:00
l10n daemon script
f98953380f SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-05-31 20:22:34 +02:00
l10n daemon script
bc08ff79e6 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-05-31 14:20:49 +02:00
Antonio Larrosa
1d36164230 Use ecm_qt_declare_logging_category to declare the logging categories 
This automatizes the generation of logging categories so a
kdeconnect-kde.categories is generated and installed to
/usr/share/qlogging-categories5/ so kdebugsettings can use it.

Also, sets the default logging level to Warning. So now the logs
of users won't be filled with debug messages but they can
modify the configuration easily with kdebugsettings.
 2020-05-26 18:55:47 +02:00
Aditya Mehra
8bf49850f1 use tv icon for bigscreen plugin 2020-05-23 22:10:24 +00:00
Aditya Mehra
cf2967b9af Add Bigscreen plugin with support for Bigscreen STT packet type 2020-05-23 22:10:24 +00:00
Nicolas Fella
e084ae451a Add icon to notifyrc back 
This was removed to drop the notificationsplugin's "No icon" hack, but de facto all notifications have icons.

This makes sure that the KDE Connect entry in the notifications KCM has an icon
 2020-05-22 22:36:12 +02:00
Tony Sesek
83a152f41f [pausemusic] Add option to not unpause music once call has finished. 2020-05-20 21:44:33 +00:00
Max Rumpf
fbadf09fb5 mpriscontrol plugin should ignore playerctld 
playerctld (https://github.com/altdesktop/playerctl/issues/161) is a proxy daemon for the currently active player by playerctl, which facilitates managing mpris players, forwarding requests to the currently active/last active player, and sorting out troubles with selecting the correct player manually.
Unfortunately, it also creates an annoying issue with kdeconnect: when playing media on the phone, kdeconnect publishes the state to the computer through the mprisremote plugin - then, playerctld picks it up as active player, and registers its own mpris media player. As a result, the mpriscontrol plugin sees this as a running media player, and in turn, publishes the state back to the phone, essentially creating another media session on the phone, resulting in two notifications. As playerctld is _always_ only a proxy to another media player (or kdeconnect), it can safely be ignored, just like kdeconnect itself already is. This commit adds an if check doing exactly that.
 2020-05-20 21:12:33 +00:00
Aniket Kumar
d0367f11fb Removing earlier hack to pass an address as a string instead of ConversationAdress type. 2020-05-18 08:11:26 +05:30
Nicolas Fella
1f97935e9e Remove obsolete entries in notifyrc 2020-05-15 17:26:42 +02:00
Nicolas Fella
872d5c6464 Merge branch 'release/20.04' 2020-05-14 18:16:05 +02:00
Nicolas Fella
4df8dfc882 Fix findthisdevice sound URL 2020-05-14 13:26:18 +00:00
Weixuan XIAO
15cbe32259 Disable presenter because of missing of qml 2020-05-09 11:57:48 +02:00
Nicolas Fella
3e9fd8622a Remove obsolete version checks 2020-05-03 22:59:52 +02:00
Abdel-Rahman Abdel-Rahman
d73bcdb00e Unmute audio when volume changes 
BUG: 408705
 2020-04-29 03:55:42 +00:00
Nicolas Fella
b59ef618b2 [notifications] Set actions before sending the notification 2020-04-23 17:34:37 +00:00
Philip Cohn-Cort
c315170be5 Finally, we have support for sending out Battery information. 
## Summary

The core idea is as follows:

1. When a Link loads the BatteryPlugin, we query Solid for a list of batteries.
    1. If the list is empty, we print a warning message and return quickly
    2. Otherwise, we connect *two signals* to every object in that list
2. We send out a single new NetworkPacket as soon as we've processed that list
3. When either of those two signals emits, we send another new NetworkPacket

### Multi-battery Support

BUG: 357193

To handle devices with multiple batteries (requested in that bug), we average
together the battery percentages. This also includes a new field in the packet for
'number of batteries' called `batteryQuantity`. For backwards compatibility, we can
assume it has a default value of one.

This should ensure we support
- devices with no batteries at all (like many desktop machines)
- devices with hot-pluggable batteries (like those laptops with detachable screens)

### Concerns

Note that the implementation isn't perfect.
We'll need some new localizable text to make it clear that we now support sending
battery status information.

Then there's a rather significant question: maybe we should have two battery plugins
on each client, like we do for the `findmyphone`/`findthisdevice` plugins?

## Test Plan

We need to ensure that other clients (including those using the Android codebase)
will respond correctly. The main things to look at are
1. are these new packets sent when the plugin is enabled, and not sent when it's disabled?
2. is the charge percentage accurate?
3. is the charge state (charging, discharging, or full) accurate?
and
4. do we see the correct number of warnings for low-battery?
 2020-04-13 05:54:11 +00:00
Nicolas Fella
b3d78d6d07 [notifications] Drop no icon hack 2020-04-12 23:07:51 +00:00
l10n daemon script
da0089c741 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-04-09 11:01:28 +02:00
l10n daemon script
5ef95c7c25 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-04-09 06:26:57 +02:00
l10n daemon script
baf52b49ac SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-04-08 11:04:09 +02:00
l10n daemon script
43ea8052fe SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-04-08 06:32:15 +02:00
Abdel-Rahman Abdel-Rahman
d3062cafd4 Receive SMS subscription ID and reply using it 
This interprets the "sub_id" field to use it later for replying in
order to reply to SMS messages from the same SIM.
 2020-04-07 20:01:18 +00:00
l10n daemon script
1634126eb5 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-04-07 10:16:35 +02:00
l10n daemon script
0e04769a43 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-04-07 06:11:40 +02:00
l10n daemon script
f6d85cfd7e SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-04-06 10:20:19 +02:00
l10n daemon script
b83a028435 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-04-06 06:09:41 +02:00
Kai Uwe Broulik
e48e34d776 Merge branch 'release/20.04' 2020-03-31 15:19:26 +02:00
Kai Uwe Broulik
310b0517ed Check for null notification 
When starting a phone call on the phone, we enter "talking" state without having created a notification first leading to a crash.
 2020-03-31 15:18:29 +02:00
Arjun Thekoot Harisankar
77e08ec70a Update README.txt in Plugins to include the current method to build a skeleton for a Plugin 2020-03-27 21:02:16 +05:30
Nicolas Fella
468bc4151d Merge branch 'release/20.04' 2020-03-23 17:23:57 +01:00
Aniket Kumar
f211d7e401 Add feature to start new conversation with existing contacts 
## Summary

Start a conversation with contacts having no previous conversation with.

It is currently only possible to use the messaging app to send a message to a conversation which already exists.

This patch implements this feature by integrating all contacts having no prior conversation with the recent conversations in the recent conversation list and at the bottom in a sorted manner, something like this,

The contacts are stored in the recent conversation list model as a conversation but with INVALID conversation ID and INVALID conversation DATE.

## Testing

Testing just needs kdeconnect daemon to be recompiled and executed.
 2020-03-21 22:57:28 +00:00
Nicolas Fella
2725de9170 Improve call notification handling 
Simplify the code, close the notification when talking.
 2020-03-21 22:18:34 +01:00
Nicolas Fella
2e15294caf Merge branch 'release/20.04' 2020-03-21 21:27:28 +01:00
Nicolas Fella
9f1101c9c1 Use kdeconnect-settings for command configuration 
Instead of relying on kde-cli-tools being installed.
 2020-03-21 21:26:51 +01:00
l10n daemon script
08df418cc9 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-03-21 09:48:57 +01:00
l10n daemon script
782f2ffe72 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-03-21 05:50:32 +01:00
Albert Vaca Cintora
9feb4e5510 Merge branch 'strace/kdeconnect-kde-seamless_playback' 2020-03-21 00:24:49 +01:00
l10n daemon script
87d58643a2 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-03-17 10:05:04 +01:00
l10n daemon script
201be5d898 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-03-16 10:21:09 +01:00
Matthijs Tijink
04d2f51b24 Adds an MPRIS server for controlling other device's MPRIS services 
By creating a DBus connection per player, we are able to support
multiple remote players.

The album art is not yet supported.
 2020-03-15 23:46:56 +01:00
Matthijs Tijink
f7b7cdbfd5 Adds an MPRIS server for controlling other device's MPRIS services 
By creating a DBus connection per player, we are able to support
multiple remote players.

The album art is not yet supported.
 2020-03-15 22:38:03 +00:00
Abdel-Rahman Abdel-Rahman
0240c43bb5 Make incoming call notification persistent 
Accomplishes task T11851
 2020-03-15 23:34:52 +02:00
l10n daemon script
81a2be7670 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-03-11 06:07:22 +01:00
l10n daemon script
0c8df41d89 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-03-04 06:04:04 +01:00
l10n daemon script
7eee223dfc SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-03-02 05:46:53 +01:00
Richard Liebscher
bb5539c8c3 Make plugins work in SailfishConnect 2020-03-01 20:00:40 +00:00
Aniket Kumar
ec7519c1ef Update shareplugin.cpp: added code snippet to check the open condition of the received network package and to act accordingly. 2020-02-16 16:31:14 +00:00
l10n daemon script
5fd09c904d SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-02-14 05:56:20 +01:00
l10n daemon script
c61a67f86a SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-02-04 06:10:13 +01:00
Nicolas Fella
e0d5927bca Generat 2020-01-21 02:55:46 +00:00
Nicolas Fella
6025f7cc48 Remove usused includes 2020-01-20 22:35:37 +01:00
Nicolas Fella
f28ea834e1 Use generated DBus interface in mpriscontrol 2020-01-20 17:36:44 +01:00
Soul Trace
1829c89235 Apply suggestion to plugins/mpriscontrol/mpriscontrolplugin.cpp 2020-01-18 17:26:16 +00:00
Soul Trace
d80e48f4c7 Let user open in the PC browser media URL to Android device [2/2] 
Let kdeconnect-kde send xesam:url field to renote device in "url" field.
 2020-01-18 16:28:05 +03:00
l10n daemon script
c54104b24f SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2020-01-09 05:46:17 +01:00
l10n daemon script
6883d46cb4 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2019-12-30 05:38:56 +01:00
l10n daemon script
835be41511 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2019-12-25 05:45:20 +01:00
Yuri Chornoivan
ba8ee54558 Fix minor typos 2019-12-22 10:15:58 +02:00
Yuri Chornoivan
01c4d0411b Fix minor EBN issues 2019-12-22 09:49:55 +02:00
Peter Mello
bc3c7567a7 Port away from deprecated KIO/KCM functions 
Updated plugins/share/shareplugin.cpp:
 - KFileUtils::suggestName() is a drop-in replacement as of 5.64,
   just moved to another library
Updated plugins/findthisdevice/findthisdevice_config.cpp:
 - KCModule::markAsChanged() is likewise as of 5.64

Signed-off-by: Peter J. Mello <admin@petermello.net>
 2019-12-20 00:23:49 +00:00
Baptiste Ashka
8aca11e102 Use URL as title and album in MPRIS plugin 
Summary:
The current behavior in plasma-workspace's mediacontroller is to get the
title and the album info from the URL contained in the MPRIS metadata,
if it is dealing with a local file and missing title and artist. This
commit aligns the behavior to the one mediacontroller has.

Reviewers: #kde_connect, nicolasfella

Reviewed By: #kde_connect, nicolasfella

Subscribers: nicolasfella, kdeconnect

Tags: #kde_connect

Differential Revision: https://phabricator.kde.org/D26097
 2019-12-19 18:11:12 +01:00
l10n daemon script
b830c8f33b SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2019-12-19 05:49:03 +01:00
Richard Liebscher
ba34672cbd Make build for SailfishConnect possible 2019-12-09 22:14:19 +00:00
l10n daemon script
bf0c2e54e3 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2019-12-09 05:15:13 +01:00
Nicolas Fella
9afa6b6d91 Revert "Port deprecated method" 
This requires a newer KF5 version than the current minimum.

This reverts commit e933ae5450.
 2019-12-06 23:14:19 +01:00
Laurent Montel
e933ae5450 Port deprecated method 2019-12-06 13:33:13 +01:00