diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-15 09:09:23 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-15 09:09:24 +0200 |
| commit | 605617b5dce6ccd8826d07aabe2db781ae3aa9b4 (patch) | |
| tree | 9b014020fce4f53e92442c6914e5bc6f6264e879 /src/corelib/io/qlockfile_unix.cpp | |
| parent | d370878aa0510e1e51eb9014965f505e395f3f81 (diff) | |
| parent | d238f7e0190c49c0f07c24f2f4ef9a50577c389b (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Change-Id: I004854a25ebbf12b1fda88900162fe7878716c58
Diffstat (limited to 'src/corelib/io/qlockfile_unix.cpp')
| -rw-r--r-- | src/corelib/io/qlockfile_unix.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qlockfile_unix.cpp b/src/corelib/io/qlockfile_unix.cpp index c663681aaa..b817a24c74 100644 --- a/src/corelib/io/qlockfile_unix.cpp +++ b/src/corelib/io/qlockfile_unix.cpp @@ -102,7 +102,7 @@ static QBasicAtomicInt fcntlOK = Q_BASIC_ATOMIC_INITIALIZER(-1); /*! \internal Checks that the OS isn't using POSIX locks to emulate flock(). - Mac OS X is one of those. + OS X is one of those. */ static bool fcntlWorksAfterFlock() { |