diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-06 01:00:45 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-06 01:00:46 +0200 |
| commit | 3460e6e941181ccdc56e74d5bd1ed190b6e6f417 (patch) | |
| tree | bc4379b75ad945325248fec9841b7cd75850ade0 /src/corelib/io | |
| parent | 6b66108c1ffc48ee1dc06c4e25d9210bf2d41084 (diff) | |
| parent | 0998a9d1d53361e572d7377af8cb41a49bbfad72 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ib7c4fc52915b5e6c72b9aa262fb59f2a041dccd7
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); |