diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2022-06-20 20:57:07 -0700 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2022-06-21 16:32:59 -0700 |
commit | b1323371bc322ac50152571a5d9f7be5f922b596 (patch) | |
tree | 8e44990859d727435ba84b6b2d5ed1f257468cfc | |
parent | 275d702bc0fce0d54a1969c08113ee4ba250c75c (diff) | |
download | qtwayland-b1323371bc322ac50152571a5d9f7be5f922b596.tar.gz |
Client: fix license in two files
This amends d89c8920f3b82dd2098971b5a66c4b9c75da5af0.
The client library is LGPL. Probably a copy & paste error.
Change-Id: I6d3880c7d99d4fc494c8fffd16fa869e524d5ac2
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit feae5bef02a4c9ce280f55d231890243b1783946)
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r-- | src/client/shellintegration/qwaylandclientshellapi_p.h | 20 | ||||
-rw-r--r-- | src/client/shellintegration/qwaylandshellintegration.cpp | 20 |
2 files changed, 30 insertions, 10 deletions
diff --git a/src/client/shellintegration/qwaylandclientshellapi_p.h b/src/client/shellintegration/qwaylandclientshellapi_p.h index a8863e7d..f89368d6 100644 --- a/src/client/shellintegration/qwaylandclientshellapi_p.h +++ b/src/client/shellintegration/qwaylandclientshellapi_p.h @@ -5,7 +5,7 @@ ** ** This file is part of the QtWaylandClient module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:GPL$ +** $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 @@ -14,14 +14,24 @@ ** 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 3 or (at your option) 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.GPL3 +** 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-3.0.html. +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** diff --git a/src/client/shellintegration/qwaylandshellintegration.cpp b/src/client/shellintegration/qwaylandshellintegration.cpp index 5bb61703..5d39ac1e 100644 --- a/src/client/shellintegration/qwaylandshellintegration.cpp +++ b/src/client/shellintegration/qwaylandshellintegration.cpp @@ -5,7 +5,7 @@ ** ** This file is part of the QtWaylandClient module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:GPL$ +** $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 @@ -14,14 +14,24 @@ ** 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 3 or (at your option) 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.GPL3 +** 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-3.0.html. +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** |