summaryrefslogtreecommitdiffstats
path: root/src/corelib/io/qlockfile_p.h
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2017-09-29 21:20:08 -0700
committerThiago Macieira <thiago.macieira@intel.com>2017-10-06 01:53:47 +0000
commit3399d79773fcd57dded2a184ee94936469538b4b (patch)
tree4216fdccfa20b30d59d6aa5bde517d98e4e4e3f3 /src/corelib/io/qlockfile_p.h
parentde3f764be835f43e2128ddb1f8d67b859b06e63e (diff)
QLockFile/Unix: drop the use of fcntl(F_SETLK)
F_SETLK is bad. Explanation in the comment. And flock(2) does work with NFS on Linux, so let's just stick to that, which is simpler. We only use the file locks when we attempt to delete an apparently stale lock: that is, for a lock file that is at least staleLockTime old. Change-Id: I0b48fc8e90304e0dacc3fffd14e908c8c4c9d59b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: David Faure <david.faure@kdab.com>
Diffstat (limited to 'src/corelib/io/qlockfile_p.h')
-rw-r--r--src/corelib/io/qlockfile_p.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/corelib/io/qlockfile_p.h b/src/corelib/io/qlockfile_p.h
index 86a606ec00..a6f61b20f3 100644
--- a/src/corelib/io/qlockfile_p.h
+++ b/src/corelib/io/qlockfile_p.h
@@ -85,10 +85,6 @@ public:
// used in dbusmenu
Q_CORE_EXPORT static QString processNameByPid(qint64 pid);
-#ifdef Q_OS_UNIX
- static int checkFcntlWorksAfterFlock(const QString &fn);
-#endif
-
QString fileName;
#ifdef Q_OS_WIN
Qt::HANDLE fileHandle;