Skip to content

Commit b2efaeb

Browse files
kkoehnekkoehne
committed
tests: Unify license to GPL-EXCEPT
Change-Id: Ic718650a8a7bddd4ee28c5650a3f5baf70886e51 Reviewed-by: Thiago Macieira <[email protected]> Reviewed-by: Jani Heikkinen <[email protected]>
1 parent 801f89a commit b2efaeb

File tree

52 files changed

+561
-1296
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+561
-1296
lines changed

‎tests/auto/cmake/test_QFINDTESTDATA/tests/main.cpp

+11-16
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,26 @@
11
/****************************************************************************
22
**
33
** Copyright (C) 2016 Stephen Kelly <steveire@gmail,com>
4-
** Contact: http://www.qt.io/licensing/
4+
** Contact: https://www.qt.io/licensing/
55
**
66
** This file is part of the test suite of the Qt Toolkit.
77
**
8-
** $QT_BEGIN_LICENSE:LGPL21$
8+
** $QT_BEGIN_LICENSE:GPL-EXCEPT$
99
** Commercial License Usage
1010
** Licensees holding valid commercial Qt licenses may use this file in
1111
** accordance with the commercial license agreement provided with the
1212
** Software or, alternatively, in accordance with the terms contained in
1313
** a written agreement between you and The Qt Company. For licensing terms
14-
** and conditions see http://www.qt.io/terms-conditions. For further
15-
** information use the contact form at http://www.qt.io/contact-us.
14+
** and conditions see https://www.qt.io/terms-conditions. For further
15+
** information use the contact form at https://www.qt.io/contact-us.
1616
**
17-
** GNU Lesser General Public License Usage
18-
** Alternatively, this file may be used under the terms of the GNU Lesser
19-
** General Public License version 2.1 or version 3 as published by the Free
20-
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
21-
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
22-
** following information to ensure the GNU Lesser General Public License
23-
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
24-
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
25-
**
26-
** As a special exception, The Qt Company gives you certain additional
27-
** rights. These rights are described in The Qt Company LGPL Exception
28-
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
17+
** GNU General Public License Usage
18+
** Alternatively, this file may be used under the terms of the GNU
19+
** General Public License version 3 as published by the Free Software
20+
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
21+
** included in the packaging of this file. Please review the following
22+
** information to ensure the GNU General Public License requirements will
23+
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
2924
**
3025
** $QT_END_LICENSE$
3126
**

‎tests/auto/corelib/global/qfloat16/tst_qfloat16.cpp

+6-18
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/****************************************************************************
22
**
33
** Copyright (C) 2016 by Southwest Research Institute (R)
4-
** Contact: http://www.qt-project.org/legal
4+
** Contact: https://www.qt.io/licensing/
55
**
6-
** This file is part of the QtCore module of the Qt Toolkit.
6+
** This file is part of the test suite of the Qt Toolkit.
77
**
8-
** $QT_BEGIN_LICENSE:LGPL$
8+
** $QT_BEGIN_LICENSE:GPL-EXCEPT$
99
** Commercial License Usage
1010
** Licensees holding valid commercial Qt licenses may use this file in
1111
** accordance with the commercial license agreement provided with the
@@ -14,30 +14,18 @@
1414
** and conditions see https://www.qt.io/terms-conditions. For further
1515
** information use the contact form at https://www.qt.io/contact-us.
1616
**
17-
** GNU Lesser General Public License Usage
18-
** Alternatively, this file may be used under the terms of the GNU Lesser
19-
** General Public License version 3 as published by the Free Software
20-
** Foundation and appearing in the file LICENSE.LGPL3 included in the
21-
** packaging of this file. Please review the following information to
22-
** ensure the GNU Lesser General Public License version 3 requirements
23-
** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
24-
**
2517
** GNU General Public License Usage
2618
** Alternatively, this file may be used under the terms of the GNU
27-
** General Public License version 2.0 or (at your option) the GNU General
28-
** Public license version 3 or any later version approved by the KDE Free
29-
** Qt Foundation. The licenses are as published by the Free Software
30-
** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
19+
** General Public License version 3 as published by the Free Software
20+
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
3121
** included in the packaging of this file. Please review the following
3222
** information to ensure the GNU General Public License requirements will
33-
** be met: https://www.gnu.org/licenses/gpl-2.0.html and
34-
** https://www.gnu.org/licenses/gpl-3.0.html.
23+
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
3524
**
3625
** $QT_END_LICENSE$
3726
**
3827
****************************************************************************/
3928

40-
4129
#include <QtTest/QtTest>
4230
#include <QFloat16>
4331

‎tests/auto/corelib/global/qglobalstatic/tst_qglobalstatic.cpp

+9-31
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
** Copyright (C) 2016 Intel Corporation.
55
** Contact: https://www.qt.io/licensing/
66
**
7-
** This file is part of the QtCore module of the Qt Toolkit.
7+
** This file is part of the test suite of the Qt Toolkit.
88
**
9-
** $QT_BEGIN_LICENSE:BSD$
9+
** $QT_BEGIN_LICENSE:GPL-EXCEPT$
1010
** Commercial License Usage
1111
** Licensees holding valid commercial Qt licenses may use this file in
1212
** accordance with the commercial license agreement provided with the
@@ -15,35 +15,13 @@
1515
** and conditions see https://www.qt.io/terms-conditions. For further
1616
** information use the contact form at https://www.qt.io/contact-us.
1717
**
18-
** BSD License Usage
19-
** Alternatively, you may use this file under the terms of the BSD license
20-
** as follows:
21-
**
22-
** "Redistribution and use in source and binary forms, with or without
23-
** modification, are permitted provided that the following conditions are
24-
** met:
25-
** * Redistributions of source code must retain the above copyright
26-
** notice, this list of conditions and the following disclaimer.
27-
** * Redistributions in binary form must reproduce the above copyright
28-
** notice, this list of conditions and the following disclaimer in
29-
** the documentation and/or other materials provided with the
30-
** distribution.
31-
** * Neither the name of The Qt Company Ltd nor the names of its
32-
** contributors may be used to endorse or promote products derived
33-
** from this software without specific prior written permission.
34-
**
35-
**
36-
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
37-
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
38-
** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
39-
** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
40-
** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
41-
** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
42-
** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
43-
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
44-
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
45-
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
46-
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
18+
** GNU General Public License Usage
19+
** Alternatively, this file may be used under the terms of the GNU
20+
** General Public License version 3 as published by the Free Software
21+
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
22+
** included in the packaging of this file. Please review the following
23+
** information to ensure the GNU General Public License requirements will
24+
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
4725
**
4826
** $QT_END_LICENSE$
4927
**

‎tests/auto/corelib/io/qfilesystemmetadata/tst_qfilesystemmetadata.cpp

+9-17
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,26 @@
11
/****************************************************************************
22
**
33
** Copyright (C) 2017 The Qt Company Ltd.
4-
** Contact: http://www.qt.io/licensing/
4+
** Contact: https://www.qt.io/licensing/
55
**
66
** This file is part of the test suite of the Qt Toolkit.
77
**
8-
** $QT_BEGIN_LICENSE:LGPL3$
8+
** $QT_BEGIN_LICENSE:GPL-EXCEPT$
99
** Commercial License Usage
1010
** Licensees holding valid commercial Qt licenses may use this file in
1111
** accordance with the commercial license agreement provided with the
1212
** Software or, alternatively, in accordance with the terms contained in
1313
** a written agreement between you and The Qt Company. For licensing terms
14-
** and conditions see http://www.qt.io/terms-conditions. For further
15-
** information use the contact form at http://www.qt.io/contact-us.
16-
**
17-
** GNU Lesser General Public License Usage
18-
** Alternatively, this file may be used under the terms of the GNU Lesser
19-
** General Public License version 3 as published by the Free Software
20-
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
21-
** packaging of this file. Please review the following information to
22-
** ensure the GNU Lesser General Public License version 3 requirements
23-
** will be met: https://www.gnu.org/licenses/lgpl.html.
14+
** and conditions see https://www.qt.io/terms-conditions. For further
15+
** information use the contact form at https://www.qt.io/contact-us.
2416
**
2517
** GNU General Public License Usage
2618
** Alternatively, this file may be used under the terms of the GNU
27-
** General Public License version 2.0 or later as published by the Free
28-
** Software Foundation and appearing in the file LICENSE.GPL included in
29-
** the packaging of this file. Please review the following information to
30-
** ensure the GNU General Public License version 2.0 requirements will be
31-
** met: http://www.gnu.org/licenses/gpl-2.0.html.
19+
** General Public License version 3 as published by the Free Software
20+
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
21+
** included in the packaging of this file. Please review the following
22+
** information to ensure the GNU General Public License requirements will
23+
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
3224
**
3325
** $QT_END_LICENSE$
3426
**

‎tests/auto/dbus/qdbusconnection_spyhook/tst_qdbusconnection_spyhook.cpp

+11-16
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,26 @@
11
/****************************************************************************
22
**
33
** Copyright (C) 2016 Intel Corporation.
4-
** Contact: http://www.qt.io/licensing/
4+
** Contact: https://www.qt.io/licensing/
55
**
66
** This file is part of the test suite of the Qt Toolkit.
77
**
8-
** $QT_BEGIN_LICENSE:LGPL21$
8+
** $QT_BEGIN_LICENSE:GPL-EXCEPT$
99
** Commercial License Usage
1010
** Licensees holding valid commercial Qt licenses may use this file in
1111
** accordance with the commercial license agreement provided with the
1212
** Software or, alternatively, in accordance with the terms contained in
1313
** a written agreement between you and The Qt Company. For licensing terms
14-
** and conditions see http://www.qt.io/terms-conditions. For further
15-
** information use the contact form at http://www.qt.io/contact-us.
14+
** and conditions see https://www.qt.io/terms-conditions. For further
15+
** information use the contact form at https://www.qt.io/contact-us.
1616
**
17-
** GNU Lesser General Public License Usage
18-
** Alternatively, this file may be used under the terms of the GNU Lesser
19-
** General Public License version 2.1 or version 3 as published by the Free
20-
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
21-
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
22-
** following information to ensure the GNU Lesser General Public License
23-
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
24-
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
25-
**
26-
** As a special exception, The Qt Company gives you certain additional
27-
** rights. These rights are described in The Qt Company LGPL Exception
28-
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
17+
** GNU General Public License Usage
18+
** Alternatively, this file may be used under the terms of the GNU
19+
** General Public License version 3 as published by the Free Software
20+
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
21+
** included in the packaging of this file. Please review the following
22+
** information to ensure the GNU General Public License requirements will
23+
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
2924
**
3025
** $QT_END_LICENSE$
3126
**

‎tests/auto/gui/kernel/qkeyevent/tst_qkeyevent.cpp

+11-16
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,26 @@
11
/****************************************************************************
22
**
3-
** Copyright (C) 2016 The Qt Company Ltd.
3+
** Copyright (C) 2017 The Qt Company Ltd.
44
** Contact: https://www.qt.io/licensing/
55
**
66
** This file is part of the test suite of the Qt Toolkit.
77
**
8-
** $QT_BEGIN_LICENSE:LGPL21$
8+
** $QT_BEGIN_LICENSE:GPL-EXCEPT$
99
** Commercial License Usage
1010
** Licensees holding valid commercial Qt licenses may use this file in
1111
** accordance with the commercial license agreement provided with the
1212
** Software or, alternatively, in accordance with the terms contained in
1313
** a written agreement between you and The Qt Company. For licensing terms
14-
** and conditions see http://www.qt.io/terms-conditions. For further
15-
** information use the contact form at http://www.qt.io/contact-us.
14+
** and conditions see https://www.qt.io/terms-conditions. For further
15+
** information use the contact form at https://www.qt.io/contact-us.
1616
**
17-
** GNU Lesser General Public License Usage
18-
** Alternatively, this file may be used under the terms of the GNU Lesser
19-
** General Public License version 2.1 or version 3 as published by the Free
20-
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
21-
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
22-
** following information to ensure the GNU Lesser General Public License
23-
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
24-
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
25-
**
26-
** As a special exception, The Qt Company gives you certain additional
27-
** rights. These rights are described in The Qt Company LGPL Exception
28-
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
17+
** GNU General Public License Usage
18+
** Alternatively, this file may be used under the terms of the GNU
19+
** General Public License version 3 as published by the Free Software
20+
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
21+
** included in the packaging of this file. Please review the following
22+
** information to ensure the GNU General Public License requirements will
23+
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
2924
**
3025
** $QT_END_LICENSE$
3126
**

‎tests/auto/other/qtokenautomaton/tokenizers/boilerplate/boilerplate.xml

+12-17
Original file line numberDiff line numberDiff line change
@@ -23,32 +23,27 @@
2323
<boilerplate>
2424
<prolog>/****************************************************************************
2525
**
26-
** Copyright (C) 2015 The Qt Company Ltd.
27-
** Contact: http://www.qt.io/licensing/
26+
** Copyright (C) 2017 The Qt Company Ltd.
27+
** Contact: https://www.qt.io/licensing/
2828
**
2929
** This file is part of the test suite of the Qt Toolkit.
3030
**
31-
** $QT_BEGIN_LICENSE:LGPL21$
31+
** $QT_BEGIN_LICENSE:GPL-EXCEPT$
3232
** Commercial License Usage
3333
** Licensees holding valid commercial Qt licenses may use this file in
3434
** accordance with the commercial license agreement provided with the
3535
** Software or, alternatively, in accordance with the terms contained in
3636
** a written agreement between you and The Qt Company. For licensing terms
37-
** and conditions see http://www.qt.io/terms-conditions. For further
38-
** information use the contact form at http://www.qt.io/contact-us.
37+
** and conditions see https://www.qt.io/terms-conditions. For further
38+
** information use the contact form at https://www.qt.io/contact-us.
3939
**
40-
** GNU Lesser General Public License Usage
41-
** Alternatively, this file may be used under the terms of the GNU Lesser
42-
** General Public License version 2.1 or version 3 as published by the Free
43-
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
44-
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
45-
** following information to ensure the GNU Lesser General Public License
46-
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
47-
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
48-
**
49-
** As a special exception, The Qt Company gives you certain additional
50-
** rights. These rights are described in The Qt Company LGPL Exception
51-
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
40+
** GNU General Public License Usage
41+
** Alternatively, this file may be used under the terms of the GNU
42+
** General Public License version 3 as published by the Free Software
43+
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
44+
** included in the packaging of this file. Please review the following
45+
** information to ensure the GNU General Public License requirements will
46+
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
5247
**
5348
** $QT_END_LICENSE$
5449
**

‎tests/auto/widgets/widgets/qmenubar/tst_qmenubar_mac.mm

+4-15
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
**
66
** This file is part of the test suite of the Qt Toolkit.
77
**
8-
** $QT_BEGIN_LICENSE:LGPL$
8+
** $QT_BEGIN_LICENSE:GPL-EXCEPT$
99
** Commercial License Usage
1010
** Licensees holding valid commercial Qt licenses may use this file in
1111
** accordance with the commercial license agreement provided with the
@@ -14,24 +14,13 @@
1414
** and conditions see https://www.qt.io/terms-conditions. For further
1515
** information use the contact form at https://www.qt.io/contact-us.
1616
**
17-
** GNU Lesser General Public License Usage
18-
** Alternatively, this file may be used under the terms of the GNU Lesser
19-
** General Public License version 3 as published by the Free Software
20-
** Foundation and appearing in the file LICENSE.LGPL3 included in the
21-
** packaging of this file. Please review the following information to
22-
** ensure the GNU Lesser General Public License version 3 requirements
23-
** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
24-
**
2517
** GNU General Public License Usage
2618
** Alternatively, this file may be used under the terms of the GNU
27-
** General Public License version 2.0 or (at your option) the GNU General
28-
** Public license version 3 or any later version approved by the KDE Free
29-
** Qt Foundation. The licenses are as published by the Free Software
30-
** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
19+
** General Public License version 3 as published by the Free Software
20+
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
3121
** included in the packaging of this file. Please review the following
3222
** information to ensure the GNU General Public License requirements will
33-
** be met: https://www.gnu.org/licenses/gpl-2.0.html and
34-
** https://www.gnu.org/licenses/gpl-3.0.html.
23+
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
3524
**
3625
** $QT_END_LICENSE$
3726
**

‎tests/benchmarks/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/****************************************************************************
22
**
33
** Copyright (C) 2016 Olivier Goffart <[email protected]>
4-
** Contact: http://www.qt.io/licensing/
4+
** Contact: https://www.qt.io/licensing/
55
**
66
** This file is part of the test suite of the Qt Toolkit.
77
**

0 commit comments

Comments
 (0)