diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2019-12-18 11:04:51 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2020-02-12 11:18:08 +0100 |
| commit | bfaadab30cb804204e90498437c360b037cc0b8d (patch) | |
| tree | 0e536093fc0fe9538a57e487c81a3dfd23916c00 /src/script/bridge/qscriptglobalobject_p.h | |
| parent | 5eedef9953db0859cf9d13b618ea51a071febe39 (diff) | |
| download | qtscript-bfaadab30cb804204e90498437c360b037cc0b8d.tar.gz | |
Fix license headers in src/script
The LGPL-ONLY header is outdated, and the referenced LICENSE.LGPL file
does not exist anymore. Anyhow, the module is documented to be available
under Commercial/LGPLv3/GPLv2; that the JavaScriptCore dependency is
LGPLv2.1 or later is separate.
Fixes: QTBUG-80883
Change-Id: Ic76c127a7643fb90ebd99b6472f84c81a7dc2eee
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Diffstat (limited to 'src/script/bridge/qscriptglobalobject_p.h')
| -rw-r--r-- | src/script/bridge/qscriptglobalobject_p.h | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/src/script/bridge/qscriptglobalobject_p.h b/src/script/bridge/qscriptglobalobject_p.h index a919c6c..5c5718f 100644 --- a/src/script/bridge/qscriptglobalobject_p.h +++ b/src/script/bridge/qscriptglobalobject_p.h @@ -5,17 +5,33 @@ ** ** This file is part of the QtScript module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL-ONLY$ +** $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 +** 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. +** ** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the +** 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 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. ** -** If you have questions regarding the use of this file, please contact -** us via http://www.qt.io/contact-us/. +** 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$ ** |