l10n daemon script
7a085f6b0f
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"
4 years ago
l10n daemon script
6ee4f674e7
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"
4 years ago
l10n daemon script
8e7c9dbe5c
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"
4 years ago
l10n daemon script
189ff0c175
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"
4 years ago
l10n daemon script
0b7f20a81d
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"
4 years ago
ivan tkachenko
adf20437b9
powermanagement: Fix log message formatting
...
Printing out QString takes care of adding both spaces and double quotes.
Otherwise, it used to be like this:
Data for ' "Battery1" ' not found
4 years ago
l10n daemon script
93fe23fac6
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"
4 years ago
l10n daemon script
560b4ca52b
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"
4 years ago
l10n daemon script
7bb5f17a92
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"
4 years ago
l10n daemon script
f243c71f2b
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"
4 years ago
l10n daemon script
3f5f5c9eb5
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"
4 years ago
l10n daemon script
79b5eb22a6
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"
4 years ago
l10n daemon script
dae0a5df5e
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"
4 years ago
Volker Krause
74614801ae
Add various missing includes and link libraries
...
Those are no longer pulled in indirectly with KF deprecation level 5.94.
4 years ago
l10n daemon script
ff817abcbb
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"
4 years ago
l10n daemon script
f363b0fe42
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"
4 years ago
Laurent Montel
9756b911da
REmove duplicate header between header/file
4 years ago
l10n daemon script
13e1ddcf98
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"
4 years ago
l10n daemon script
a09776c06c
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"
4 years ago
l10n daemon script
100aa732fa
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"
4 years ago
l10n daemon script
460a6485b9
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"
4 years ago
Volker Krause
3628ef1d68
Port network online detection for Qt6
...
QNetworkConfigurationManager has been replaced by QNetworkInformation.
4 years ago
l10n daemon script
0024939c7a
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"
4 years ago
Volker Krause
e29df8668f
Port from QStringRef to QStringView, QStringRef is gone in Qt6
...
The QStringView::to<Number>() methods in Qt5 cause one extra allocation
compared to the QStringRef counter-part. As long as we aren't on a hot
path this is probably not worth the extra #ifdef though.
4 years ago
Volker Krause
c2576f8a1f
Adapt to Qt6's removal of Qt::X11Extras
4 years ago
Laurent Montel
b55d32857e
Fix some clazy warning (const'ify + use const'ref + initialize variable in headers)
4 years ago
l10n daemon script
1f3a932c5e
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"
4 years ago
Laurent Montel
5fbe1eabdc
Fix some clazy warnings
4 years ago
Laurent Montel
7af8064dbe
Show more headers in qtc6
4 years ago
Laurent Montel
734f3084cf
Fix some clazy warnings
4 years ago
Laurent Montel
111200bf24
Fix show headers in qtc6
4 years ago
Volker Krause
fad6830b6e
Adapt to API changes in QDBusMetaType in Qt6
4 years ago
Volker Krause
d83c1a1801
Port the solid and time engines to KLazyLocalizedString
...
As noted before, the way data engines deal with localized texts seems
dubious, but that hopefully gets fixed by moving away from data engines.
Either way, this doesn't make things better or worse.
4 years ago
Volker Krause
24812f8ba2
Port keystate data engine to KLazyLocalizedString
...
The I18N_NOOP use here looks questionable, as we hand out untranslated
strings to somebody else who might use a different domain for translating
them, but probably not worth reworking with data engines on the way out
anyway. This change doesn't make this any better or worse.
4 years ago
Volker Krause
38c723e596
Use version-less Qt targets, variables and macros
...
Prepares for building against Qt6.
4 years ago
Volker Krause
aa62130a15
Adapt to QtConcurrent changes in Qt6
...
Accessing the QFuture result is no longer implicit, and run() changed
the argument order.
4 years ago
Volker Krause
b307cfeace
Add additional includes needed by Qt6
...
Also remove two unused includes gone in Qt6.
4 years ago
Volker Krause
3ee46882d1
Adapt to Qt6 API changes in QXmlStreamReader
...
This now uses QStringView rather than QStringRef.
4 years ago
Volker Krause
662276bab0
Remove non-implemented ctor declaration
...
Has the nice side-effect of removing a reference to the deprecated
KPluginInfo.
4 years ago
l10n daemon script
fcb522f815
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"
4 years ago
l10n daemon script
a298977479
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"
4 years ago
l10n daemon script
a7588366e6
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"
4 years ago
l10n daemon script
4d532f0801
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"
4 years ago
Alexander Lohnau
ee0bb8c103
dataengines/apps: Use KIO::ApplicationLauncherJob for starting KService
...
While we construct a QUrl, we want to start the service and not launch a url
4 years ago
l10n daemon script
daed0461eb
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"
4 years ago
l10n daemon script
2141988c3b
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"
4 years ago
Konrad Materka
645eba9903
applets/systemtray: Do not delay menuImporter deletion
...
BUG: 442463
FIXED-IN: 5.24.0
4 years ago
l10n daemon script
6721c2ec92
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"
4 years ago
ivan tkachenko
d8215d5426
[dataengines/powermanagement] Ensure Battery.Percent data is always an integer
...
It used to have inconsistent types depending on internal conditions
(sometimes double, sometimes int), but now it's fixed.
4 years ago
ivan tkachenko
271bdc254e
[dataengines/powermanagement] Factor out setting data.Battery.Sources
...
In other places both properties are being set unconditionally, so this
patch just aligns it to other code. Also, possibly fixing scenario
where the Sources property might de-synchronize because the code
conditionally skipped updating it.
4 years ago