Alexander Lohnau
c61fad5561
Do not make virtual methods of KCModule Q_SLOT
...
We do not need those methods to be marked as slots and the KCMUtils
classes like KPluginWidget also don't need it.
Meaning it just results in more moc code being generated.
2023-07-22 20:51:19 +00:00
Alexander Lohnau
f740a8bda8
Use target-centric CMake approach for declaring debug category
...
This makes it easier to read, because we do not have to handle a list of
files that get added to the targets. In other KDE projects, we also
prefer the target centric approach.
In case one wants to reuse the same category in multiple places, it
would be best to create a small static lib. But for now, this is not
needed.
2023-07-22 20:51:19 +00:00
Alexander Lohnau
999f8e00de
Remove explicit plugin Id
...
The one derived from the filename is identical. Deriving it from the filename is the preferred approach.
In KF6, log messages are printed out if the Id is needlessly specified.
A mismatching Id vs basename would print out a warning.
2023-07-22 20:51:19 +00:00
Alexander Lohnau
319696c445
Remove version and website metadata for plugins
...
The plugin version doesn't matter, because all plugins are shipped as
part of kdeconnect and not separately.
The website was also set inconsistently, some pointed to a custom blog,
the KDE homepage or a broken link. If we want to make announcements more
visible, we should have a link in a more central place.
2023-07-22 19:12:33 +02:00
Alexander Lohnau
4ca8f98b7d
Remove obsolete ServiceTypes definitions
...
Task: https://phabricator.kde.org/T14483
2023-07-22 19:12:33 +02:00
Alexander Lohnau
f3998e4b5f
Fix windows build issues
...
- Add dummy args param to QProcess::startDetached
- Remove logging category from inline snippet. This was removed due to
being unused in non-windows builds.
2023-07-22 19:12:28 +02:00
Alexander Lohnau
ac3d439a2a
Clean up unneeded version checks
...
With the min. version bumped, those can be safely removed
2023-07-22 16:17:24 +02:00
Alexander Lohnau
0b99c3a637
Remove unneeded destructors from plugins
...
We already have a destructor from the baseclass and don't need to clean
up any resources in the affected plugins
2023-07-22 16:01:21 +02:00
Alexander Lohnau
d50055ddb4
plugins/runcommand: Fix messed up layouting of KCM
2023-07-20 11:15:56 +03:00
Alexander Lohnau
52b6d57942
Qt6 build fixes in plugins and KCM
2023-07-20 11:15:46 +03:00
Alexander Lohnau
c5bfc4a5b0
Allow building against Qt6/KF6
2023-07-20 11:15:41 +03:00
Albert Vaca Cintora
22be63ae9e
Remove compatibility with Qt < 5.15
...
In theory we support Qt 5.6 (because of SailfishOS) but in practice we are not checking that in the CI so probably we broke the compatibility long ago. Also, I don't think anyone is using this code in SailfishOS, so we can greatly simplify the code by requiring Qt 5.15 or later.
2023-07-18 20:13:27 +00:00
Albert Vaca Cintora
9c87393b28
clang-format pass
2023-07-16 16:20:34 +02:00
l10n daemon script
4e364c67d1
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"
2023-06-01 01:40:26 +00:00
l10n daemon script
ca5c5ab333
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"
2023-05-28 01:40:43 +00:00
l10n daemon script
40e7cab454
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"
2023-04-27 01:43:28 +00:00
l10n daemon script
bb403a3294
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"
2023-04-25 01:47:55 +00:00
l10n daemon script
eb04209601
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"
2023-04-23 01:46:30 +00:00
l10n daemon script
a5850cca3b
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"
2023-04-22 01:47:35 +00:00
l10n daemon script
5da47e9f91
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"
2023-04-18 01:41:53 +00:00
l10n daemon script
f5e93700a5
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"
2023-04-16 01:40:41 +00:00
l10n daemon script
3b42d0fc27
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"
2023-04-15 01:42:57 +00:00
l10n daemon script
c08b663401
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"
2023-04-14 01:38:30 +00:00
l10n daemon script
0a827f9e06
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"
2023-04-11 01:42:34 +00:00
l10n daemon script
ebd70efd3e
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"
2023-04-10 01:39:38 +00:00
l10n daemon script
ad53dea58e
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"
2023-04-09 01:40:22 +00:00
l10n daemon script
3040f49a2e
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"
2023-04-08 01:41:50 +00:00
Albert Vaca Cintora
02e2e1104e
Change my name to include my two last names :)
2023-04-08 00:20:47 +02:00
Albert Vaca Cintora
d925254e3a
Run command settings: add import and export buttons
...
BUG: 409388
2023-03-30 10:54:00 +00:00
Albert Vaca Cintora
0d362169a8
Revert "Support init systems other than systemd with Run Command's samples"
...
Fix example commands. "suspend" is a command to halt the shell, not to
sleep the computer. Those are just example commands so people with exotic
init systems can still type their own commands.
This reverts commit 2dc5d53ec4
.
2023-03-27 00:12:43 +02:00
l10n daemon script
c4495d5855
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"
2023-02-04 02:05:14 +00:00
l10n daemon script
3ee29af814
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"
2023-01-01 02:14:13 +00:00
l10n daemon script
6acbcd628d
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"
2022-12-15 01:56:04 +00:00
Carl Schwan
b2e83f506c
Improve and fix pluging modules
...
- Fix call to removed get() method
- Add PlaceHolderMessage in runcommand plugin
- Simplify qml code when possible
- Use latest qml import
- Fix missing i18n call
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
2022-12-14 16:46:57 +00:00
l10n daemon script
4656144ac9
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"
2022-11-19 01:48:52 +00:00
l10n daemon script
e712748881
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"
2022-11-17 01:47:30 +00:00
Volker Krause
002848efa8
Adapt build system to also support Qt 6
...
This is complicated by the Qt 5.6 requirement of SailfishOS, hopefully
that didn't get broken by this.
2022-10-29 16:51:41 +02:00
l10n daemon script
e77ba5b542
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"
2022-10-20 02:01:51 +00:00
l10n daemon script
f556dc721b
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"
2022-09-30 01:47:48 +00:00
Nicolas Fella
a918ffc0cb
Add and make use of ECM's clang-format integration
2022-09-11 23:21:58 +00:00
l10n daemon script
34da0ad9e1
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"
2022-09-05 01:43:43 +00:00
l10n daemon script
b525d660bc
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"
2022-08-25 01:46:23 +00:00
Nicolas Fella
ad01ef1695
Fix activating existing settings window on Wayland
...
Add the necessary bits for XDG activation to work
Move the code for launching the settings from the daemon to the respective processes so that we don't need to pass activation tokens over another process boundary
2022-07-06 12:55:39 +00:00
l10n daemon script
3f42e61b1d
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"
2022-07-02 02:00:21 +00:00
Waldo Lemmer
2dc5d53ec4
Support init systems other than systemd with Run Command's samples
...
`systemctl reboot`, `systemctl poweroff` and `systemctl suspend` only work on Systemd
I replaced them with the more universal versions (`reboot`, `poweroff`, and `suspend`) which work on Systemd, OpenRC, runit, SysVinit, and GNU Shepherd. These commands show up here:
![image](/uploads/b10ae0397974c90971d8cd054d13e1b4/image.png)
2022-04-21 01:02:10 +00:00
Aleix Pol
21dbf0410f
kcm: Fix showing plugins' configuration
...
We were using the plugin infrastructure to tell the name of the plugin
we were configuring.
Since this doesn't make any sense, just let the kcms themselves define
where they want their settings to be.
This fixes a regression from when we ported away from using KService to
list them. e365e1b35c
2022-03-21 18:03:45 +01:00
l10n daemon script
bb39ef84b5
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"
2021-12-16 01:53:14 +00:00
Alexander Lohnau
e365e1b35c
Port from KPluginSelector to new KPluginWidget class
...
Task: https://phabricator.kde.org/T12265
2021-12-15 08:24:22 +01:00
l10n daemon script
5c76528250
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"
2021-11-24 01:36:30 +00:00
l10n daemon script
c630a3de90
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"
2021-11-04 01:16:42 +00:00
l10n daemon script
4462b74866
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"
2021-11-03 01:25:15 +00:00
l10n daemon script
61b2e607b4
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"
2021-09-26 01:12:22 +00:00
l10n daemon script
a3082de593
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"
2021-07-28 01:18:37 +00:00
Alexander Lohnau
30d895d868
Clean up unneeded JSON parameter in kcoreaddons_add_plugin
...
The moc process already rebuilds the plugin when the JSON file changes, consequently the additional parameter is not needed.
Task: https://phabricator.kde.org/T14649
2021-06-28 20:33:52 +02:00
l10n daemon script
d071d034c3
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"
2021-06-21 01:25:33 +00:00
Yuri Chornoivan
596f648f6e
Fix minor typo
2021-06-13 10:56:51 +03:00
Piyush Aggarwal
d5c1832eba
runcommands: add sample commands for Windows
2021-06-12 16:22:31 +05:30
Piyush Aggarwal
3b7d51dc80
runcommand: avoid using cmd to allow better handling of quoted arguments
2021-05-09 05:11:41 +05:30
l10n daemon script
f4211e0431
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"
2021-04-22 01:12:28 +00:00
l10n daemon script
46a19ac6cf
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"
2021-04-19 01:18:23 +00:00
Nicolas Fella
645bf381c4
Add missing license headers
...
I'm the sole author of these files
2021-02-27 20:04:47 +01:00
l10n daemon script
cd1d047a3c
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"
2021-02-15 07:07:57 +01:00
l10n daemon script
3d670f3b33
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-11-29 06:09:21 +01:00
Nicolas Fella
1060c1a81a
Add API for opening the KCM to daemon
...
We have a few places that open the KCM, with different arguments.
Centralize the implementation in one place.
This makes it easier to switch to invoking systemsettings5 in the future (once https://invent.kde.org/plasma/systemsettings/-/merge_requests/11 is in).
It also makes sure the relevant device is selected when clicking on a pairing notification.
The function is exposed to DBus for the Plasmoid and potential third-party users.
CCBUG: 425660
2020-10-18 18:40:48 +00:00
Doron Behar
6101ef3ad0
Fix missing kcm dependency for runcommand module
...
Without it, the build may fail with:
fatal error: kcmutils_version.h: No such file or directory
35 | #include <kcmutils_version.h>
| ^~~~~~~~~~~~~~~~~~~~
2020-10-08 21:59:17 +03:00
l10n daemon script
e57fd79f26
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-09-19 06:10:24 +02:00
l10n daemon script
b7bdc75ff9
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-09-17 06:15:05 +02:00
Nicolas Fella
400c800deb
[app] Add plugin settings page
...
Include a page that allows (de)selecting and configuring plugins
This is one of the last missing pieces for feature parity with the KCM.
2020-09-08 20:33:20 +02:00
Nicolas Fella
87db95b22f
Convert license headers to SPDX expressions
2020-08-17 09:48:10 +00:00
Himanshu Rajput
3ca55ad794
Update plugins/runcommand/runcommand_config.cpp
2020-07-24 11:55:18 +00: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
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
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
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
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
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
Richard Liebscher
bb5539c8c3
Make plugins work in SailfishConnect
2020-03-01 20:00:40 +00: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
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
l10n daemon script
0856c297c1
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-09-29 05:09:20 +02:00
Nicolas Fella
0d7c504cf0
Rename DbusHelper => DBusHelper
2019-08-14 17:36:19 +02:00
l10n daemon script
2d2cf7444a
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-08-07 05:00:07 +02:00
l10n daemon script
5427754e21
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-08-01 04:51:32 +02:00
l10n daemon script
e4e4c58b60
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-07-31 05:10:13 +02:00
Piyush Aggarwal
eb9417593f
retain Header Labels when resetting commands list
2019-07-15 15:13:26 +00:00
l10n daemon script
c53108bb25
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-07-08 04:56:21 +02:00
l10n daemon script
cedd6f0c8b
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-06-29 05:17:17 +02:00
l10n daemon script
3d0acf15a5
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-06-27 05:13:07 +02:00
Nicolas Fella
5c16bfda5d
Use K_PLUGIN_CLASS_WITH_JSON
2019-06-12 22:16:54 +02:00
Nicolas Fella
e601755644
Force usage of QStringLiteral and port remaining offenders
2019-06-10 14:40:28 +00:00