diff options
author | Simo Fält <simo.falt@qt.io> | 2020-02-28 10:20:37 +0200 |
---|---|---|
committer | Simo Fält <simo.falt@qt.io> | 2020-02-28 11:58:43 +0000 |
commit | 187239ddbc37b7d98a825c5fff44e29c8561270d (patch) | |
tree | e9cea47d2931f1a00dae3409bbea6684024f3913 /src/libs/installer/lib7z_guid.h | |
parent | da375036a3cccceba8a60d774e8598656e5531b4 (diff) |
Fix license check failures
Change-Id: I123b1c6a06717c37387a636aae8296e27c1df8c0
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Diffstat (limited to 'src/libs/installer/lib7z_guid.h')
-rw-r--r-- | src/libs/installer/lib7z_guid.h | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/src/libs/installer/lib7z_guid.h b/src/libs/installer/lib7z_guid.h index 16434558c..b79fab958 100644 --- a/src/libs/installer/lib7z_guid.h +++ b/src/libs/installer/lib7z_guid.h @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. @@ -11,22 +11,27 @@ ** 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 http://qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** 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 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** As a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** 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$ ** |