diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2021-03-18 16:58:36 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2021-03-23 15:09:34 +0200 |
| commit | 975ba788d3d0ee87aa08bb5301cd33dcbf00521b (patch) | |
| tree | ff69e6112192d5a0bc0e873acd7841300c88d920 /src/sensors/qdistancesensor.cpp | |
| parent | b85e041d265730bed57fa13984c074ccf0c5ebe6 (diff) | |
Revert "Update commercial license headers"v5.15.3-lts-lgpl
This reverts commit b85e041d265730bed57fa13984c074ccf0c5ebe6.
Revert of commercial license headers is required for Qt 5.15.3
opensource release.
Task-number: QTBUG-91108
Change-Id: I5099c4d0724955724ad7239ab0d3b22949d9bd92
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Diffstat (limited to 'src/sensors/qdistancesensor.cpp')
| -rw-r--r-- | src/sensors/qdistancesensor.cpp | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/src/sensors/qdistancesensor.cpp b/src/sensors/qdistancesensor.cpp index eb362328..916218f8 100644 --- a/src/sensors/qdistancesensor.cpp +++ b/src/sensors/qdistancesensor.cpp @@ -5,8 +5,7 @@ ** ** This file is part of the QtSensors module of the Qt Toolkit. ** - ** $QT_BEGIN_LICENSE:COMM$ - ** + ** $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 @@ -15,24 +14,26 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** - ** $QT_END_LICENSE$ - ** - ** - ** - ** - ** - ** - ** - ** - ** - ** - ** - ** - ** - ** - ** - ** + ** 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$ ** ****************************************************************************/ |