diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-20 23:00:27 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-10-20 23:19:30 +0000 |
| commit | 9ef793ba9539b4eddb7893c0df9be6e211d9984f (patch) | |
| tree | 7b9374b8dcc8cbbc3b92636b2029f1b55c5e3194 /src/corelib/global/minimum-linux_p.h | |
| parent | e631e900fd0cd7467b1dccb5fa401afdcd1e41a8 (diff) | |
| parent | 7a252ac46780b6145084d8d5ca0549b2de3639cc (diff) | |
Merge "Merge remote-tracking branch 'origin/5.11' into 5.12" into refs/staging/5.12
Diffstat (limited to 'src/corelib/global/minimum-linux_p.h')
| -rw-r--r-- | src/corelib/global/minimum-linux_p.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/corelib/global/minimum-linux_p.h b/src/corelib/global/minimum-linux_p.h index bad2488b4d..9c074e13ba 100644 --- a/src/corelib/global/minimum-linux_p.h +++ b/src/corelib/global/minimum-linux_p.h @@ -75,9 +75,14 @@ QT_BEGIN_NAMESPACE * - accept4 2.6.28 * - renameat2 3.16 QT_CONFIG(renameat2) * - getrandom 3.17 QT_CONFIG(getentropy) + * - statx 4.11 QT_CONFIG(statx) */ -#if QT_CONFIG(getentropy) +#if QT_CONFIG(statx) +# define MINLINUX_MAJOR 4 +# define MINLINUX_MINOR 11 +# define MINLINUX_PATCH 0 +#elif QT_CONFIG(getentropy) # define MINLINUX_MAJOR 3 # define MINLINUX_MINOR 17 # define MINLINUX_PATCH 0 |