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/qiodevice.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/qiodevice.cpp')
| -rw-r--r-- | src/corelib/io/qiodevice.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp index f31ac75425..f5b17318be 100644 --- a/src/corelib/io/qiodevice.cpp +++ b/src/corelib/io/qiodevice.cpp @@ -895,7 +895,7 @@ void QIODevicePrivate::seekBuffer(qint64 newPos) For some devices, atEnd() can return true even though there is more data to read. This special case only applies to devices that generate data in direct response to you calling read() (e.g., \c /dev or \c /proc files on - Unix and OS X, or console input / \c stdin on all platforms). + Unix and \macos, or console input / \c stdin on all platforms). \sa bytesAvailable(), read(), isSequential() */ |