diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-15 03:01:32 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-15 03:01:32 +0100 |
commit | 3a358430efe797fe1c0f1aa7f701f9139a642d6f (patch) | |
tree | 46b944c662e15a1a92840143783d6a82d2c4807d /src/script/parser/qscript.g | |
parent | 47c070072496933909ee1267fb26a6f62b169528 (diff) | |
parent | bfaadab30cb804204e90498437c360b037cc0b8d (diff) | |
download | qtscript-3a358430efe797fe1c0f1aa7f701f9139a642d6f.tar.gz |
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1
Change-Id: Ib26f2a7d33bc1823f13765dda22ef574f4fd55df
Diffstat (limited to 'src/script/parser/qscript.g')
-rw-r--r-- | src/script/parser/qscript.g | 34 |
1 files changed, 25 insertions, 9 deletions
diff --git a/src/script/parser/qscript.g b/src/script/parser/qscript.g index ac71a1b..577fd38 100644 --- a/src/script/parser/qscript.g +++ b/src/script/parser/qscript.g @@ -3,19 +3,35 @@ -- Copyright (C) 2018 The Qt Company Ltd. -- Contact: http://www.qt.io/licensing/ -- --- This file is part of the FOO module of the Qt Toolkit. +-- This file is part of the QtScript module of the Qt Toolkit. +-- +-- $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. -- --- $QT_BEGIN_LICENSE:LGPL-ONLY$ -- 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$ -- |