plasma5: 5.13.5 -> 5.14.0

This commit is contained in:
Bastian Köcher
2018-10-11 15:24:37 +02:00
parent 3388263e82
commit 7e0e4ce6ad
11 changed files with 225 additions and 266 deletions
@@ -1,8 +1,8 @@
diff --git a/kded/engine/fusebackend_p.cpp b/kded/engine/fusebackend_p.cpp
index 81ce494..d3c5c9f 100644
index d07e313..ea7d81c 100644
--- a/kded/engine/fusebackend_p.cpp
+++ b/kded/engine/fusebackend_p.cpp
@@ -103,7 +103,7 @@ QProcess *FuseBackend::process(const QString &executable,
@@ -106,7 +106,7 @@ QProcess *FuseBackend::process(const QString &executable,
QProcess *FuseBackend::fusermount(const QStringList &arguments) const
{
@@ -11,7 +11,7 @@ index 81ce494..d3c5c9f 100644
}
@@ -245,4 +245,3 @@ bool FuseBackend::isOpened(const MountPoint &mountPoint) const
@@ -279,4 +279,3 @@ bool FuseBackend::isOpened(const MountPoint &mountPoint) const
}
} // namespace PlasmaVault