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/qfsfileengine.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/qfsfileengine.cpp')
| -rw-r--r-- | src/corelib/io/qfsfileengine.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/io/qfsfileengine.cpp b/src/corelib/io/qfsfileengine.cpp index 13ede56d2a..ddbd24338b 100644 --- a/src/corelib/io/qfsfileengine.cpp +++ b/src/corelib/io/qfsfileengine.cpp @@ -603,7 +603,7 @@ qint64 QFSFileEnginePrivate::readFdFh(char *data, qint64 len) result = fread(data + readBytes, 1, size_t(len - readBytes), fh); eof = feof(fh); if (retry && eof && result == 0) { - // On Mac OS, this is needed, e.g., if a file was written to + // On OS X, this is needed, e.g., if a file was written to // through another stream since our last read. See test // tst_QFile::appendAndRead QT_FSEEK(fh, QT_FTELL(fh), SEEK_SET); // re-sync stream. @@ -875,7 +875,7 @@ bool QFSFileEngine::supportsExtension(Extension extension) const /*! \fn QFileInfoList QFSFileEngine::drives() For Windows, returns the list of drives in the file system as a list - of QFileInfo objects. On unix, Mac OS X and Windows CE, only the + of QFileInfo objects. On Unix and Windows CE, only the root path is returned. On Windows, this function returns all drives (A:\, C:\, D:\, etc.). |