l10n daemon script
66675fcff5
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"
5 years ago
l10n daemon script
e4499f6018
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"
5 years ago
Konrad Materka
7c9021ebbc
[SNI] Handle NewMenu signal
...
Qt uses NewMenu signal to notify when new context menu is set.
It is not part of the official standard but already used by Qt
(starting from Qt 5.11).
BUG: 383202
FIXED-IN: 5.22.0
5 years ago
l10n daemon script
9493c9a210
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"
5 years ago
l10n daemon script
0e41342c0d
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"
5 years ago
l10n daemon script
9d630a85da
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"
5 years ago
l10n daemon script
dda3c4103a
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"
5 years ago
l10n daemon script
af05d4cb3a
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"
5 years ago
l10n daemon script
bd034b4dfa
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"
5 years ago
l10n daemon script
fc4635f887
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"
5 years ago
l10n daemon script
6214e7b950
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"
5 years ago
Laurent Montel
3dc2b734f0
GIT_SILENT: don't use deprecated cmake variable
5 years ago
l10n daemon script
c29c1baf31
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"
5 years ago
l10n daemon script
39947e3d38
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"
5 years ago
Nate Graham
47f79ce607
[applets/devicenotifier] Play sound when device can be safely removed
...
Apparently this was a KDE 4 feature that was lost in the Plasma 5 port.
I've re-implemented it using a notification, so it can be turned off or
customized if the user so desires. Kamoso does something similar.
BUG: 384469
FIXED-IN: 5.21
5 years ago
Nicolas Fella
7f13eea36e
Use imported targets for X11 libs
...
They are more robust and nicer than variables
5 years ago
Nicolas Fella
1a07220843
Use versionless Qt cmake target
...
This makes it easier to build against both Qt5 and Qt6
5 years ago
Alexander Lohnau
823d2106ec
Run clang-format
...
If you want git blame to ignore formatting revisions run:
git config blame.ignoreRevsFile .git-blame-ignore-revs
5 years ago
Nicolas Fella
69b7aec0de
Manually prevent clang-format formatting
...
The result would be too disruptive
5 years ago
Alexander Lohnau
d3f58b05e4
Port a bunch of foreach usages
5 years ago
David Edmundson
3af84bff1e
[dataengines/mpris] Port to QDBusServiceWatcher
...
QDBusServiceWatcher gained wildcard support in Qt 5.14. We can now port
to use it over the deprecated signal on QDBusConnectionInterface.
This not only ports away from deprecated code, but should reduce
plasmashell wakeups for unreltaed enties.
5 years ago
Alexander Lohnau
8b4cf5a197
Remove dead code
5 years ago
Tiernan Hubble
a36ffb6970
Fix Environment Canada weather domain.
5 years ago
l10n daemon script
cac7059671
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"
5 years ago
Alexander Volkov
1ee1e599c6
Port PowerManagement data engine and PowerDevilRunner away from kdelibs4support
5 years ago
Nicolas Fella
2a81512f0c
[weatherengine] Port from KPluginInfo to KPluginMetaData
5 years ago
l10n daemon script
e83998f381
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"
5 years ago
Nicolas Fella
b7869bf267
Add trailing commas to enums
...
We do this sometimes, but not consistenly.
The benefit is twofold.
First it improves the diff when adding new values since no existing line needs to be touched.
Second it prevents clang-format from collapsing the definition into a single line, which is undesired for large enums.
5 years ago
Nicolas Fella
7f5d8768c1
Expand enums to multiple lines
...
Most of our enum declaratons are on multiple lines, but not all of them.
Expand the remaining ones to be consistent
5 years ago
l10n daemon script
00661fb2e4
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"
5 years ago
Miklós Máté
b5aa5bb87d
dataengines: remove an unused header
...
It was imported from libksysguard, but I don't know why.
https://phabricator.kde.org/D26499
Signed-off-by: Miklós Máté <mtmkls@gmail.com>
5 years ago
l10n daemon script
11d3721ad4
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"
5 years ago
l10n daemon script
ff9f6c8c10
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"
5 years ago
Laurent Montel
457fd4d232
If include is define in .h remove it if it's defined in .cpp too (scripted)
5 years ago
l10n daemon script
706014c0d8
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"
5 years ago
l10n daemon script
2b176fdd5d
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"
6 years ago
l10n daemon script
811d85cbd7
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"
6 years ago
Yoann Laissus
866c7ed17e
Add separate play and pause media control shortcuts
...
The media pause key has been affected by default to the pause shortcut
6 years ago
Yoann Laissus
742f4c8657
Use CanStop instead of CanControl for the media stop shortcut
...
CanStop has additional checks about the playback status
6 years ago
Alexander Lohnau
cee40b3e90
Remove commented code
...
This code has been commented out for 6 years and was not missed.
6 years ago
l10n daemon script
5d1078dff9
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"
6 years ago
Kai Uwe Broulik
8801aae8aa
[Battery Monitor] Indicate when a charge limit has been configured
6 years ago
l10n daemon script
2aecf659a6
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"
6 years ago
l10n daemon script
6d0c45a6bc
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"
6 years ago
Nicolas Fella
57cfab21ac
Drop empty X-KDE-PluginInfo-Depends
...
The whole concept is almost unused and there's no point in having it there but empty
See also https://phabricator.kde.org/T13553
6 years ago
Laurent Montel
ddb82b7a0c
Port away from deprecated Qt::MidButton
6 years ago
l10n daemon script
551f41f03f
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"
6 years ago
Antonio Rojas
e3134289f5
Fix build with gpsd 3.21
...
Adapt to API changes
6 years ago
David Redondo
cfa9ee2990
Port from deprecated QProcess signals
6 years ago
l10n daemon script
7cf779db86
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"
6 years ago