diff options
Diffstat (limited to 'src/corelib/global/minimum-linux_p.h')
-rw-r--r-- | src/corelib/global/minimum-linux_p.h | 76 |
1 files changed, 21 insertions, 55 deletions
diff --git a/src/corelib/global/minimum-linux_p.h b/src/corelib/global/minimum-linux_p.h index 5112015663..d52df474fb 100644 --- a/src/corelib/global/minimum-linux_p.h +++ b/src/corelib/global/minimum-linux_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 Intel Corporation. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2017 Intel Corporation. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef MINIMUMLINUX_P_H #define MINIMUMLINUX_P_H @@ -58,6 +22,7 @@ // #include "private/qglobal_p.h" +#include <sys/stat.h> QT_BEGIN_NAMESPACE @@ -71,36 +36,37 @@ QT_BEGIN_NAMESPACE * - FUTEX_PRIVATE_FLAG 2.6.22 * - O_CLOEXEC 2.6.23 * - eventfd 2.6.23 + * - FUTEX_WAIT_BITSET 2.6.25 * - pipe2 & dup3 2.6.27 * - accept4 2.6.28 * - renameat2 3.16 QT_CONFIG(renameat2) * - getrandom 3.17 QT_CONFIG(getentropy) - * - statx 4.11 QT_CONFIG(statx) + * - statx 4.11 STATX_BASIC_STATS */ -#if QT_CONFIG(statx) && !QT_CONFIG(glibc) +#if defined(__GLIBC__) && defined(STATX_BASIC_STATS) // 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 +# define QT_ELF_NOTE_OS_MAJOR 4 +# define QT_ELF_NOTE_OS_MINOR 11 +# define QT_ELF_NOTE_OS_PATCH 0 #elif QT_CONFIG(getentropy) -# define MINLINUX_MAJOR 3 -# define MINLINUX_MINOR 17 -# define MINLINUX_PATCH 0 +# define QT_ELF_NOTE_OS_MAJOR 3 +# define QT_ELF_NOTE_OS_MINOR 17 +# define QT_ELF_NOTE_OS_PATCH 0 #elif QT_CONFIG(renameat2) -# define MINLINUX_MAJOR 3 -# define MINLINUX_MINOR 16 -# define MINLINUX_PATCH 0 +# define QT_ELF_NOTE_OS_MAJOR 3 +# define QT_ELF_NOTE_OS_MINOR 16 +# define QT_ELF_NOTE_OS_PATCH 0 #else -# define MINLINUX_MAJOR 2 -# define MINLINUX_MINOR 6 -# define MINLINUX_PATCH 28 + +# define QT_ELF_NOTE_OS_MAJOR 2 +# define QT_ELF_NOTE_OS_MINOR 6 +# define QT_ELF_NOTE_OS_PATCH 28 #endif -#define MINIMUM_LINUX_VERSION QT_VERSION_CHECK(MINLINUX_MAJOR, MINLINUX_MINOR, MINLINUX_PATCH) +/* you must include <elf.h> */ +#define QT_ELF_NOTE_OS_TYPE ELF_NOTE_OS_LINUX QT_END_NAMESPACE |