diff options
author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2021-03-18 16:40:26 +0200 |
---|---|---|
committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2021-03-23 11:40:25 +0200 |
commit | f95e2411d7c978def87846ea7cedf3dc5fd7c8b8 (patch) | |
tree | e5ae7813eb5776ab3d4d39e25822f3913410e5ca /src/serialport/qserialportinfo.cpp | |
parent | 79cc3f07a089e9f58b0b2487b274cca36261bd30 (diff) |
Revert "Update commercial license headers"v5.15.3-lts-lgpl
This reverts commit 79cc3f07a089e9f58b0b2487b274cca36261bd30.
Revert of commercial license headers is required for Qt 5.15.3
opensource release.
Task-number: QTBUG-91108
Change-Id: I1bf013ca03cbdaba7a965ff800c9a5ab9d723ca6
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
Diffstat (limited to 'src/serialport/qserialportinfo.cpp')
-rw-r--r-- | src/serialport/qserialportinfo.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/serialport/qserialportinfo.cpp b/src/serialport/qserialportinfo.cpp index 4e65d1a3..3bfa56c4 100644 --- a/src/serialport/qserialportinfo.cpp +++ b/src/serialport/qserialportinfo.cpp @@ -7,8 +7,7 @@ ** ** This file is part of the QtSerialPort 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 @@ -17,25 +16,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$ ** ****************************************************************************/ |