diff options
author | Liang Qi <liang.qi@qt.io> | 2018-01-18 07:40:00 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-01-18 07:40:00 +0100 |
commit | 97399982e325d0376d599f7595abd48d49364058 (patch) | |
tree | 9b6388295fd52da0c6fee2d3a4d866c31d764755 /tests/auto/qscriptqwidgets/tst_qscriptqwidgets.cpp | |
parent | 94b3194bb02bfba8ca3e3dfb76ac8b4207dc3658 (diff) | |
parent | 86317d8799cba34ad682a1709cf46a5eee815c82 (diff) | |
download | qtscript-97399982e325d0376d599f7595abd48d49364058.tar.gz |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.qmake.conf
Change-Id: I77f29cac3182808e0b9601f3415c9740b8f0fa88
Diffstat (limited to 'tests/auto/qscriptqwidgets/tst_qscriptqwidgets.cpp')
-rw-r--r-- | tests/auto/qscriptqwidgets/tst_qscriptqwidgets.cpp | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/tests/auto/qscriptqwidgets/tst_qscriptqwidgets.cpp b/tests/auto/qscriptqwidgets/tst_qscriptqwidgets.cpp index 7c3c20c..2364ee6 100644 --- a/tests/auto/qscriptqwidgets/tst_qscriptqwidgets.cpp +++ b/tests/auto/qscriptqwidgets/tst_qscriptqwidgets.cpp @@ -1,31 +1,26 @@ /**************************************************************************** ** -** Copyright (C) 2012 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly <stephen.kelly@kdab.com> -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly <stephen.kelly@kdab.com> +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtGui module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL21$ +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ ** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** 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 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** As a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** 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. ** ** $QT_END_LICENSE$ ** |