diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-18 09:22:56 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-05-18 11:17:10 +0000 |
| commit | 1af15a565924bb021da15d55b46ef141ca3314c5 (patch) | |
| tree | ddf3718e1cb86dd050e206d05996b9e85e45882d /src | |
| parent | 24d7a2229d416d73c8235ab0601d8cb4f3d858c4 (diff) | |
| parent | 294f036a119766d64d88ee5a36f10e364dd80e1f (diff) | |
Merge "Merge remote-tracking branch 'origin/5.11.0' into 5.11" into refs/staging/5.11
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/io/qfilesystemengine_unix.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp index b8cf42a2e9..be6ce48d0c 100644 --- a/src/corelib/io/qfilesystemengine_unix.cpp +++ b/src/corelib/io/qfilesystemengine_unix.cpp @@ -114,6 +114,8 @@ static int renameat2(int oldfd, const char *oldpath, int newfd, const char *newp # if !QT_CONFIG(statx) && defined(SYS_statx) static int statx(int dirfd, const char *pathname, int flag, unsigned mask, struct statx *statxbuf) { return syscall(SYS_statx, dirfd, pathname, flag, mask, statxbuf); } +# elif !QT_CONFIG(statx) && !defined(SYS_statx) +# undef STATX_BASIC_STATS # endif # endif // !Q_OS_ANDROID #endif |