plasma5: 5.17.5 -> 5.18.5

This commit is contained in:
Milan Pässler
2020-08-21 19:48:12 +02:00
committed by Milan Pässler
parent 0d131f81eb
commit 381667a4b3
13 changed files with 226 additions and 375 deletions
@@ -17,7 +17,7 @@ Index: plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp
void ClockHelper::toHwclock()
{
- QString hwclock = KStandardDirs::findExe(QStringLiteral("hwclock"), exePath);
- QString hwclock = QStandardPaths::findExecutable(QStringLiteral("hwclock"), exePath.split(QLatin1Char(':')));
+ QString hwclock = QLatin1String(NIXPKGS_HWCLOCK);
if (!hwclock.isEmpty()) {
KProcess::execute(hwclock, QStringList() << QStringLiteral("--systohc"));