l10n daemon script
b79ac648c3
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 Lohnau
e092b6f6c3
Port GeolocationProvider plugin loading away from KServiceTypeTrader
...
Instead install the plugins in the plasma/geolocationprovider namespace
and load them using KPluginLoader.
Task: https://phabricator.kde.org/T12179
5 years ago
Alexander Lohnau
ffcb97c69a
Remove custom macro for creating plugin
...
Instead use K_PLUGIN_CLASS_WITH_JSON and embedded JSON metadata
Task: https://phabricator.kde.org/T14542
5 years ago
l10n daemon script
fda04df492
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
57e19ac905
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
9cffc2cf0a
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
faad339db5
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 Lohnau
8f369bfba6
Do not install service file for dataengines
...
The plugins are loaded from their namespace and not using the service
types.
Querying them using KServiceTypeTrader would not work, because the
X-KDE-Library property does not contain the namespace.
Considering that nobody complained about that we can stop installing
them.
5 years ago
l10n daemon script
96355cd03a
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 Lohnau
90ede05980
dataengines: Use K_PLUGIN_CLASS_WITH_JSON directly
...
Task: https://phabricator.kde.org/T14542
5 years ago
Aleix Pol
6545d5584d
Support xdg_activation_v1 on SNI invokations
...
Only issues actions after a token has been requested and received.
5 years ago
l10n daemon script
70edbdfd28
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
Joe Dight
500e061366
Point bbcukmet to new location API
...
BUG: 430643
5 years ago
l10n daemon script
a34ed17ff7
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 Lohnau
37ffc51a84
Use kcoreaddons_add_plugin cmake function for dataengines
...
Task: https://phabricator.kde.org/T14528
5 years ago
Nicolas Fella
178a4f8756
Use version-less qt DBus macros
...
They work with both Qt5 and Qt6
5 years ago
l10n daemon script
e23a15460c
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 Lohnau
a66b047894
Port away from deprecated KSycoca::databaseChanged signal
...
The list of changed resources is hardcoded in the KService
implementation, consequently we can remove those checks.
5 years ago
l10n daemon script
404b3d464f
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
140c92fe82
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
4eaf342a7f
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
c61f9ec7b0
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
a7cecdb0d8
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 Lohnau
f7b556dddf
GIT_SILENT Re-run clang-format
5 years ago
Alexander Lohnau
fd9c790b8e
GIT_SILENT Make small adjustment before running clang-format
5 years ago
Alexander Lohnau
f6c0feff49
GIT_SILENT Add trailing comma to initializer lists
...
This will result in cleaner diffs when a new value is added
and clang-format will not indent them with the opening
brace of the initializer list which makes is slightly easier to read.
5 years ago
l10n daemon script
0c57ec7073
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
9f02b43f3f
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
40bf43ad57
[dataengines/sni] Reapply IconThemePath on icon theme change
...
SNI can have custom icon path in IconThemePath attribute.
StatusNotifierItemSource uses custom KIconLoader to add this theme dir.
KIconLoader forgets this path on any system change
(for example when icon theme is change in system settings).
Reapply custom theme path on KIconLoader::iconChanged.
BUG: 433557
FIXED-IN: 5.22.0
5 years ago
l10n daemon script
7fb5605b5d
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
c990c49264
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
89d7161b1c
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 Lohnau
f07b7f1c23
GIT_SILENT Fix incorrect Q_EMIT keyword usage
5 years ago
Nicolas Fella
78f04b5813
Port from QString::SkipEmptyParts to Qt::SkipEmptyParts
5 years ago
Ahmad Samir
7e09d62cd0
Use Q_SIGNALS instead of signals in header files
...
And remove DQT_NO_SIGNALS_SLOTS_KEYWORDS from applets/kicker/CMakeLists.txt.
5 years ago
l10n daemon script
c83cfd2f5b
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
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