diff options
author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2021-03-18 15:50:32 +0200 |
---|---|---|
committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2021-03-22 13:25:22 +0200 |
commit | 1bf01b84e30aab2b87a19184ce42160e6c92d8b1 (patch) | |
tree | 44286920f93b97262210a0dab3a8ba925ce4fccc /src/location/maps/qgeoroutesegment_p.h | |
parent | 6b1dc419f9cf32ee8ec739f4f12f44b1addca2d9 (diff) | |
download | qtlocation-1bf01b84e30aab2b87a19184ce42160e6c92d8b1.tar.gz |
Revert "Update commercial license headers"v5.15.3-lts-lgpl
This reverts commit a924cd38a71af86023e0a9ea19d3379136b68c7f.
Revert of commercial license headers is required for Qt 5.15.3
opensource release.
Task-number: QTBUG-91108
Change-Id: I654419ef3fafe26dbf525e7d5e15c4ed9c2c7853
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
Diffstat (limited to 'src/location/maps/qgeoroutesegment_p.h')
-rw-r--r-- | src/location/maps/qgeoroutesegment_p.h | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/location/maps/qgeoroutesegment_p.h b/src/location/maps/qgeoroutesegment_p.h index 3e31b272..d72f8b22 100644 --- a/src/location/maps/qgeoroutesegment_p.h +++ b/src/location/maps/qgeoroutesegment_p.h @@ -1,37 +1,37 @@ /**************************************************************************** ** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:COMM$ -** +** $QT_BEGIN_LICENSE:LGPL3$ ** 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. +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://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.LGPLv3 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.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 later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. ** ** $QT_END_LICENSE$ ** -** -** -** -** -** -** -** -** -** -** -** -** -** -** -** ****************************************************************************/ #ifndef QGEOROUTESEGMENT_P_H |