diff options
Diffstat (limited to 'src/libs/installer/lib7z_list.h')
-rw-r--r-- | src/libs/installer/lib7z_list.h | 38 |
1 files changed, 8 insertions, 30 deletions
diff --git a/src/libs/installer/lib7z_list.h b/src/libs/installer/lib7z_list.h index 965a8b5ea..2dec655b1 100644 --- a/src/libs/installer/lib7z_list.h +++ b/src/libs/installer/lib7z_list.h @@ -1,11 +1,11 @@ /************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2022 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** -** $QT_BEGIN_LICENSE:LGPL$ +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,24 +14,13 @@ ** 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 +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT ** 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. +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** @@ -40,6 +29,7 @@ #define LIB7Z_LIST_H #include "installer_global.h" +#include "abstractarchive.h" #include <QDateTime> #include <QFile> @@ -47,19 +37,7 @@ namespace Lib7z { - struct INSTALLER_EXPORT File - { - public: - QString path; - QDateTime utcTime; - QPoint archiveIndex; - bool isDirectory = false; - quint64 compressedSize = 0; - quint64 uncompressedSize = 0; - QFile::Permissions permissions = 0; - }; - - INSTALLER_EXPORT bool operator==(const File &lhs, const File &rhs); + typedef QInstaller::ArchiveEntry File; QVector<File> INSTALLER_EXPORT listArchive(QFileDevice *archive); |