Heiko Becker
38ced5810c
Make Prison a required dependency
...
7bd9bea072 started using Prison
unconditionally via QML import. So if Prison isn't installed the
clipboard applet stops working, complaining that "org.kde.prison is
not installed".
While it would certainly be possible to add another call to
"find_package(KF5Prison)" with TYPE RUNTIME, the result in
feature_summary would be very confusing, because OPTIONAL has a higher
priority and the runtime hint would vanish if you build with e.g.
-DCMAKE_DISABLE_FIND_PACKAGE_KF5Prison=TRUE.
(cherry picked from commit 63f1b86005 )
5 years ago
Christophe Giboudeaux
ae43cd8833
Revert "krdb: Call xrdb with -nocpp" to fix gitk runtime errors
...
This commit was preventing gitk from starting with
'unknown color name "BACKGROUND"' errors.
This reverts commit d360e3dcb6 .
(cherry picked from commit f0764d87fe )
6 years ago
l10n daemon script
c70b49d1d3
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
e0e552967b
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
3cea9e7354
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
2907cb04d5
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
b653f94438
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
f05588dc08
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
50c889a37f
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
63ace193f9
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
5d6c84c7dd
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
Fabian Vogt
7f336f202c
krdb: Call xrdb with -nocpp
...
Avoids the C preprocessor: fewer dependencies, less overhead.
(cherry picked from commit d360e3dcb6 )
6 years ago
Ahmad Samir
b454aa3c31
KXftConfig: port from KGlobal::dirs to QStandardPaths
...
Drive-by changes: less implicit casting from ASCII
6 years ago
Ahmad Samir
d45e5b2387
KXftConfig: modernize code
...
- Use range-for/for_each algorithim
- Less implicit casting from ASCII
- Use string comparision instead of QRegExp, the former is usually faster
- Replace one letter var names with slightly longer ones
6 years ago
l10n daemon script
70a2186afc
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
20875ff6bb
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
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
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
3b125e8632
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
02756af97f
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
356d4686e0
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
l10n daemon script
f0919cb891
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
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
l10n daemon script
32e5ee16c0
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
Alexander Lohnau
ad79bb5dad
Fix KNS deprecations
6 years ago
Alexander Lohnau
76d056dc87
Enable RemoveDeadEntries option for KNS
...
CCBUG: 416255
6 years ago
l10n daemon script
bc96f3e839
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
f738029d2e
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
d8e284ae14
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
d73ad7cb02
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
Bhushan Shah
7d5806ff1c
kcms: move some of the KCMS to plasma-workspace
...
We currently need the lookandfeel and style kcm in plasma-workspace, but
appearantly they depend on the krdb so best solution is to move all kcms
together
They are taken from plasma-desktop at the commit :
8447c08e878ccbde9c5516ba8a912993ea199cb9
6 years ago
l10n daemon script
333e0de475
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
Cyril Rossi
a7b49bec6c
KCM Feedback port to ManagedConfigModule and SettingStateBinding
6 years ago
Benjamin Port
0be055332b
[KCM] Use KCModuleData in order to allow settings loading without UI
...
- desktop theme
- icons
6 years ago
Cyril Rossi
88ff6b4841
KCMs: port Desktoptheme and icons to use SettingStateBinding
...
Use new SettingStateBinding introduced by frameworks/kdeclarative!4 and
also to support highlight of non default settings
see plasma/breeze!12
6 years ago
Dan Leinir Turthra Jensen
84401e0946
Request that KNS cleans up its cache if there are dead entries
...
This requires (though not hard) the code found in
https://invent.kde.org/frameworks/knewstuff/-/merge_requests/23 and the
idea behind this is to clean up KNewStuff's knowledge of entries which
have been deleted without telling KNewStuff about it first. This is a
further step towards fixing the bug below.
CCBUG:417985
6 years ago
David Redondo
3737a8cb49
Port away from deprecated QSet related methods
6 years ago
David Redondo
cfa9ee2990
Port from deprecated QProcess signals
6 years ago
l10n daemon script
80bc5112fd
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
9bca129b3a
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
840c61b89a
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
fee125e699
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
Matej Mrenica
2c4069779c
Revert "Report missing or incorrect translations here"
...
This reverts commit 866df3e319
6 years ago
Matej Mrenica
866df3e319
Report missing or incorrect translations here
6 years ago
l10n daemon script
c101b7a9df
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
2e71f752a0
[kcms/translation] Add Comment to package
...
This is used in plasma-settings to display a description.
6 years ago
l10n daemon script
1f61f09df5
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
eb6fc12fa7
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
Bhushan Shah
7f52a95bd4
kcms: move desktoptheme and icons kcm to plasma-workspace
...
They can be useful for mobile, they are taken from the git master of
plasma-desktop at 5d8a64ce569b5592d073eaff5f7e8a0c243fc515 sha.
6 years ago