diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-13 01:05:02 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-13 01:05:02 +0200 |
| commit | 6b8f422c5e56b95aad298e1b984fb60fba1da282 (patch) | |
| tree | 545dac994ef985cc91d92fa77da21581b6762c86 /src/corelib/io/qfilesystemwatcher.cpp | |
| parent | d04982dc84d66bec92b4b3767538676cf925ef17 (diff) | |
| parent | d9e66f63a95b24ce3a7d2a30ccaf4dcab85d55a0 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/corelib/global/qglobal.cpp
src/corelib/io/qsettings.cpp
src/corelib/itemmodels/qstringlistmodel.cpp
tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp
Change-Id: I1c6c306ef42c3c0234b19907914b19da706b4a03
Diffstat (limited to 'src/corelib/io/qfilesystemwatcher.cpp')
| -rw-r--r-- | src/corelib/io/qfilesystemwatcher.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qfilesystemwatcher.cpp b/src/corelib/io/qfilesystemwatcher.cpp index acea610625..a186b34f85 100644 --- a/src/corelib/io/qfilesystemwatcher.cpp +++ b/src/corelib/io/qfilesystemwatcher.cpp @@ -191,7 +191,7 @@ void QFileSystemWatcherPrivate::_q_directoryChanged(const QString &path, bool re the file system monitor. Also note that your process may have other file descriptors open in addition to the ones for files being monitored, and these other open descriptors also count in - the total. OS X uses a different backend and does not + the total. \macos uses a different backend and does not suffer from this issue. |