diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-05 10:57:23 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-05 10:57:24 +0200 |
| commit | 0998a9d1d53361e572d7377af8cb41a49bbfad72 (patch) | |
| tree | 809a10e4f17ca05dd657dbe78c660a6204096017 /src/corelib/io | |
| parent | e227c33455ef364353dd9f6d24934b9c35ff15ec (diff) | |
| parent | 808758ad14ab3cc752cb69e9ae791b4fbd462380 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I010a6322d12e038fdce247a58dfb05e204c2ff3b
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qfilesystemengine_unix.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp index b2d81066db..5bab897d43 100644 --- a/src/corelib/io/qfilesystemengine_unix.cpp +++ b/src/corelib/io/qfilesystemengine_unix.cpp @@ -805,11 +805,11 @@ QByteArray QFileSystemEngine::id(const QFileSystemEntry &entry) } //static -QByteArray QFileSystemEngine::id(int id) +QByteArray QFileSystemEngine::id(int fd) { QT_STATBUF statResult; - if (QT_FSTAT(id, &statResult)) { - qErrnoWarning("fstat() failed for fd %d", id); + if (QT_FSTAT(fd, &statResult)) { + qErrnoWarning("fstat() failed for fd %d", fd); return QByteArray(); } QByteArray result = QByteArray::number(quint64(statResult.st_dev), 16); |