diff options
Diffstat (limited to 'src/corelib/io/qfiledevice_p.h')
| -rw-r--r-- | src/corelib/io/qfiledevice_p.h | 49 |
1 files changed, 10 insertions, 39 deletions
diff --git a/src/corelib/io/qfiledevice_p.h b/src/corelib/io/qfiledevice_p.h index 2b97773c2f..72b43ed5a1 100644 --- a/src/corelib/io/qfiledevice_p.h +++ b/src/corelib/io/qfiledevice_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** 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) 2022 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QFILEDEVICE_P_H #define QFILEDEVICE_P_H @@ -62,6 +26,11 @@ # include <qt_windows.h> # include <winnt.h> // for SECURITY_DESCRIPTOR # include <optional> +# if defined(QT_BOOTSTRAPPED) +# define QT_FEATURE_fslibs -1 +# else +# define QT_FEATURE_fslibs 1 +# endif // QT_BOOTSTRAPPED #endif QT_BEGIN_NAMESPACE @@ -155,9 +124,11 @@ private: static constexpr auto MaxACLSize = sizeof(ACL) + (sizeof(ACCESS_ALLOWED_ACE) + SECURITY_MAX_SID_SIZE) * MaxNumACEs; - SECURITY_DESCRIPTOR sd; SECURITY_ATTRIBUTES sa; +#if QT_CONFIG(fslibs) + SECURITY_DESCRIPTOR sd; alignas(DWORD) char aclStorage[MaxACLSize]; +#endif }; #endif // Q_OS_UNIX |