diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-03-31 18:45:03 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2019-03-31 18:45:03 +0000 |
| commit | e104c1972877c1732aa3c58f52bb766a0bfa29e7 (patch) | |
| tree | de540871ce7657c4a8787066392b157bf82074cb /src/corelib/global/minimum-linux_p.h | |
| parent | c19d556863d931f5fd04d9e27ee7a47aafeaca2a (diff) | |
| parent | 29f01b32f58573b23bd35857376f6f92e15382a3 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/global/minimum-linux_p.h')
| -rw-r--r-- | src/corelib/global/minimum-linux_p.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/corelib/global/minimum-linux_p.h b/src/corelib/global/minimum-linux_p.h index 9c074e13ba..5112015663 100644 --- a/src/corelib/global/minimum-linux_p.h +++ b/src/corelib/global/minimum-linux_p.h @@ -78,7 +78,11 @@ QT_BEGIN_NAMESPACE * - statx 4.11 QT_CONFIG(statx) */ -#if QT_CONFIG(statx) +#if QT_CONFIG(statx) && !QT_CONFIG(glibc) +// if using glibc, the statx() function in sysdeps/unix/sysv/linux/statx.c +// falls back to stat() for us. +// (Using QT_CONFIG(glibc) instead of __GLIBC__ because the macros aren't +// defined in assembler mode) # define MINLINUX_MAJOR 4 # define MINLINUX_MINOR 11 # define MINLINUX_PATCH 0 |