Skip to content

Commit 83a5694

Browse files
author
Jani Heikkinen
committed
Update copyright headers
Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Outdated header.LGPL removed (use header.LGPL21 instead) Old header.LGPL3 renamed to header.LGPL3-COMM to match actual licensing combination. New header.LGPL-COMM taken in the use file which were using old header.LGPL3 (src/plugins/platforms/android/extract.cpp) Added new header.LGPL3 containing Commercial + LGPLv3 + GPLv2 license combination Change-Id: I6f49b819a8a20cc4f88b794a8f6726d975e8ffbe Reviewed-by: Matti Paaso <[email protected]>
1 parent 29daa76 commit 83a5694

File tree

6,860 files changed

+46112
-48320
lines changed

Some content is hidden

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

6,860 files changed

+46112
-48320
lines changed

‎LGPL_EXCEPTION.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Digia Qt LGPL Exception version 1.1
1+
The Qt Company Qt LGPL Exception version 1.1
22

33
As an additional permission to the GNU Lesser General Public License version
44
2.1, the object code form of a "work that uses the Library" may incorporate

‎LICENSE.LGPLv21

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
GNU LESSER GENERAL PUBLIC LICENSE
22

3-
The Qt Toolkit is Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
4-
Contact: http://www.qt-project.org/legal
3+
The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
4+
Contact: http://www.qt.io/licensing/
55

66
You may use, distribute and copy the Qt GUI Toolkit under the terms of
77
GNU Lesser General Public License version 2.1, which is displayed below.

‎LICENSE.LGPLv3

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
GNU LESSER GENERAL PUBLIC LICENSE
22

3-
The Qt Toolkit is Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
4-
Contact: http://www.qt-project.org/legal
3+
The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
4+
Contact: http://www.qt.io/licensing/
55

66
You may use, distribute and copy the Qt GUI Toolkit under the terms of
77
GNU Lesser General Public License version 3, which is displayed below.

‎LICENSE.PREVIEW.COMMERCIAL

Lines changed: 109 additions & 107 deletions
Large diffs are not rendered by default.

‎bin/fixqt4headers.pl

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,33 @@
11
#!/usr/bin/env perl
22
#############################################################################
33
##
4-
## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
5-
## Contact: http://www.qt-project.org/legal
4+
## Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies).
5+
## Contact: http://www.qt.io/licensing/
66
##
77
## This file is part of the porting tools of the Qt Toolkit.
88
##
9-
## $QT_BEGIN_LICENSE:LGPL$
9+
## $QT_BEGIN_LICENSE:LGPL21$
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
1313
## Software or, alternatively, in accordance with the terms contained in
14-
## a written agreement between you and Digia. For licensing terms and
15-
## conditions see http://qt.digia.com/licensing. For further information
16-
## use the contact form at http://qt.digia.com/contact-us.
14+
## a written agreement between you and The Qt Company. For licensing terms
15+
## and conditions see http://www.qt.io/terms-conditions. For further
16+
## information use the contact form at http://www.qt.io/contact-us.
1717
##
1818
## GNU Lesser General Public License Usage
1919
## Alternatively, this file may be used under the terms of the GNU Lesser
20-
## General Public License version 2.1 as published by the Free Software
21-
## Foundation and appearing in the file LICENSE.LGPL included in the
22-
## packaging of this file. Please review the following information to
23-
## ensure the GNU Lesser General Public License version 2.1 requirements
24-
## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
20+
## General Public License version 2.1 or version 3 as published by the Free
21+
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
22+
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
23+
## following information to ensure the GNU Lesser General Public License
24+
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
25+
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
2526
##
26-
## In addition, as a special exception, Digia gives you certain additional
27-
## rights. These rights are described in the Digia Qt LGPL Exception
27+
## As a special exception, The Qt Company gives you certain additional
28+
## rights. These rights are described in The Qt Company LGPL Exception
2829
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
2930
##
30-
## GNU General Public License Usage
31-
## Alternatively, this file may be used under the terms of the GNU
32-
## General Public License version 3.0 as published by the Free Software
33-
## Foundation and appearing in the file LICENSE.GPL included in the
34-
## packaging of this file. Please review the following information to
35-
## ensure the GNU General Public License version 3.0 requirements will be
36-
## met: http://www.gnu.org/copyleft/gpl.html.
37-
##
38-
##
3931
## $QT_END_LICENSE$
4032
##
4133
#############################################################################

‎bin/syncqt.pl

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,33 @@
11
#!/usr/bin/env perl
22
#############################################################################
33
##
4-
## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
5-
## Contact: http://www.qt-project.org/legal
4+
## Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies).
5+
## Contact: http://www.qt.io/licensing/
66
##
77
## This file is part of the build configuration tools of the Qt Toolkit.
88
##
9-
## $QT_BEGIN_LICENSE:LGPL$
9+
## $QT_BEGIN_LICENSE:LGPL21$
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
1313
## Software or, alternatively, in accordance with the terms contained in
14-
## a written agreement between you and Digia. For licensing terms and
15-
## conditions see http://qt.digia.com/licensing. For further information
16-
## use the contact form at http://qt.digia.com/contact-us.
14+
## a written agreement between you and The Qt Company. For licensing terms
15+
## and conditions see http://www.qt.io/terms-conditions. For further
16+
## information use the contact form at http://www.qt.io/contact-us.
1717
##
1818
## GNU Lesser General Public License Usage
1919
## Alternatively, this file may be used under the terms of the GNU Lesser
20-
## General Public License version 2.1 as published by the Free Software
21-
## Foundation and appearing in the file LICENSE.LGPL included in the
22-
## packaging of this file. Please review the following information to
23-
## ensure the GNU Lesser General Public License version 2.1 requirements
24-
## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
20+
## General Public License version 2.1 or version 3 as published by the Free
21+
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
22+
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
23+
## following information to ensure the GNU Lesser General Public License
24+
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
25+
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
2526
##
26-
## In addition, as a special exception, Digia gives you certain additional
27-
## rights. These rights are described in the Digia Qt LGPL Exception
27+
## As a special exception, The Qt Company gives you certain additional
28+
## rights. These rights are described in The Qt Company LGPL Exception
2829
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
2930
##
30-
## GNU General Public License Usage
31-
## Alternatively, this file may be used under the terms of the GNU
32-
## General Public License version 3.0 as published by the Free Software
33-
## Foundation and appearing in the file LICENSE.GPL included in the
34-
## packaging of this file. Please review the following information to
35-
## ensure the GNU General Public License version 3.0 requirements will be
36-
## met: http://www.gnu.org/copyleft/gpl.html.
37-
##
38-
##
3931
## $QT_END_LICENSE$
4032
##
4133
#############################################################################

‎config.tests/arch/arch.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/****************************************************************************
22
**
3-
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
3+
** Copyright (C) 2015 The Qt Company Ltd.
44
** Copyright (C) 2012 Intel Corporation
5-
** Contact: http://www.qt-project.org/legal
5+
** Contact: http://www.qt.io/licensing/
66
**
77
** This file is part of the FOO module of the Qt Toolkit.
88
**
@@ -11,9 +11,9 @@
1111
** Licensees holding valid commercial Qt licenses may use this file in
1212
** accordance with the commercial license agreement provided with the
1313
** Software or, alternatively, in accordance with the terms contained in
14-
** a written agreement between you and Digia. For licensing terms and
15-
** conditions see http://qt.digia.com/licensing. For further information
16-
** use the contact form at http://qt.digia.com/contact-us.
14+
** a written agreement between you and The Qt Company. For licensing terms
15+
** and conditions see http://www.qt.io/terms-conditions. For further
16+
** information use the contact form at http://www.qt.io/contact-us.
1717
**
1818
** GNU Lesser General Public License Usage
1919
** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -24,8 +24,8 @@
2424
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
2525
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
2626
**
27-
** In addition, as a special exception, Digia gives you certain additional
28-
** rights. These rights are described in the Digia Qt LGPL Exception
27+
** As a special exception, The Qt Company gives you certain additional
28+
** rights. These rights are described in The Qt Company LGPL Exception
2929
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
3030
**
3131
** $QT_END_LICENSE$

‎config.tests/common/avx/avx.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/****************************************************************************
22
**
3-
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
4-
** Contact: http://www.qt-project.org/legal
3+
** Copyright (C) 2015 The Qt Company Ltd.
4+
** Contact: http://www.qt.io/licensing/
55
**
66
** This file is part of the config.tests of the Qt Toolkit.
77
**
@@ -10,9 +10,9 @@
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
13-
** a written agreement between you and Digia. For licensing terms and
14-
** conditions see http://qt.digia.com/licensing. For further information
15-
** use the contact form at http://qt.digia.com/contact-us.
13+
** 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.
1616
**
1717
** GNU Lesser General Public License Usage
1818
** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -23,8 +23,8 @@
2323
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
2424
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
2525
**
26-
** In addition, as a special exception, Digia gives you certain additional
27-
** rights. These rights are described in the Digia Qt LGPL Exception
26+
** As a special exception, The Qt Company gives you certain additional
27+
** rights. These rights are described in The Qt Company LGPL Exception
2828
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
2929
**
3030
** $QT_END_LICENSE$

‎config.tests/common/avx2/avx2.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/****************************************************************************
22
**
33
** Copyright (C) 2012 Intel Corporation.
4-
** Contact: http://www.qt-project.org/legal
4+
** Contact: http://www.qt.io/licensing/
55
**
66
** This file is part of the configuration of the Qt Toolkit.
77
**
@@ -10,9 +10,9 @@
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
13-
** a written agreement between you and Digia. For licensing terms and
14-
** conditions see http://qt.digia.com/licensing. For further information
15-
** use the contact form at http://qt.digia.com/contact-us.
13+
** 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.
1616
**
1717
** GNU Lesser General Public License Usage
1818
** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -23,8 +23,8 @@
2323
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
2424
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
2525
**
26-
** In addition, as a special exception, Digia gives you certain additional
27-
** rights. These rights are described in the Digia Qt LGPL Exception
26+
** As a special exception, The Qt Company gives you certain additional
27+
** rights. These rights are described in The Qt Company LGPL Exception
2828
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
2929
**
3030
** $QT_END_LICENSE$

‎config.tests/common/c++11/c++11.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/****************************************************************************
22
**
3-
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
4-
** Contact: http://www.qt-project.org/legal
3+
** Copyright (C) 2015 The Qt Company Ltd.
4+
** Contact: http://www.qt.io/licensing/
55
**
66
** This file is part of the FOO module of the Qt Toolkit.
77
**
@@ -10,9 +10,9 @@
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
13-
** a written agreement between you and Digia. For licensing terms and
14-
** conditions see http://qt.digia.com/licensing. For further information
15-
** use the contact form at http://qt.digia.com/contact-us.
13+
** 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.
1616
**
1717
** GNU Lesser General Public License Usage
1818
** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -23,8 +23,8 @@
2323
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
2424
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
2525
**
26-
** In addition, as a special exception, Digia gives you certain additional
27-
** rights. These rights are described in the Digia Qt LGPL Exception
26+
** As a special exception, The Qt Company gives you certain additional
27+
** rights. These rights are described in The Qt Company LGPL Exception
2828
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
2929
**
3030
** $QT_END_LICENSE$

‎config.tests/common/libproxy/libproxy.cpp

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,32 @@
11
/****************************************************************************
22
**
3-
** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
4-
** Contact: http://www.qt-project.org/legal
3+
** Copyright (C) 2015 The Qt Company Ltd.
4+
** Contact: http://www.qt.io/licensing/
55
**
66
** This file is part of the config.tests of the Qt Toolkit.
77
**
8-
** $QT_BEGIN_LICENSE:LGPL$
8+
** $QT_BEGIN_LICENSE:LGPL21$
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
13-
** a written agreement between you and Digia. For licensing terms and
14-
** conditions see http://qt.digia.com/licensing. For further information
15-
** use the contact form at http://qt.digia.com/contact-us.
13+
** 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.
1616
**
1717
** GNU Lesser General Public License Usage
1818
** Alternatively, this file may be used under the terms of the GNU Lesser
19-
** General Public License version 2.1 as published by the Free Software
20-
** Foundation and appearing in the file LICENSE.LGPL included in the
21-
** packaging of this file. Please review the following information to
22-
** ensure the GNU Lesser General Public License version 2.1 requirements
23-
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
24-
**
25-
** In addition, as a special exception, Digia gives you certain additional
26-
** rights. These rights are described in the Digia Qt LGPL Exception
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
2728
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
2829
**
29-
** GNU General Public License Usage
30-
** Alternatively, this file may be used under the terms of the GNU
31-
** General Public License version 3.0 as published by the Free Software
32-
** Foundation and appearing in the file LICENSE.GPL included in the
33-
** packaging of this file. Please review the following information to
34-
** ensure the GNU General Public License version 3.0 requirements will be
35-
** met: http://www.gnu.org/copyleft/gpl.html.
36-
**
37-
**
3830
** $QT_END_LICENSE$
3931
**
4032
****************************************************************************/

‎config.tests/common/sse2/sse2.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/****************************************************************************
22
**
3-
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
4-
** Contact: http://www.qt-project.org/legal
3+
** Copyright (C) 2015 The Qt Company Ltd.
4+
** Contact: http://www.qt.io/licensing/
55
**
66
** This file is part of the config.tests of the Qt Toolkit.
77
**
@@ -10,9 +10,9 @@
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
13-
** a written agreement between you and Digia. For licensing terms and
14-
** conditions see http://qt.digia.com/licensing. For further information
15-
** use the contact form at http://qt.digia.com/contact-us.
13+
** 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.
1616
**
1717
** GNU Lesser General Public License Usage
1818
** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -23,8 +23,8 @@
2323
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
2424
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
2525
**
26-
** In addition, as a special exception, Digia gives you certain additional
27-
** rights. These rights are described in the Digia Qt LGPL Exception
26+
** As a special exception, The Qt Company gives you certain additional
27+
** rights. These rights are described in The Qt Company LGPL Exception
2828
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
2929
**
3030
** $QT_END_LICENSE$

‎config.tests/common/sse3/sse3.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/****************************************************************************
22
**
3-
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
4-
** Contact: http://www.qt-project.org/legal
3+
** Copyright (C) 2015 The Qt Company Ltd.
4+
** Contact: http://www.qt.io/licensing/
55
**
66
** This file is part of the config.tests of the Qt Toolkit.
77
**
@@ -10,9 +10,9 @@
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
13-
** a written agreement between you and Digia. For licensing terms and
14-
** conditions see http://qt.digia.com/licensing. For further information
15-
** use the contact form at http://qt.digia.com/contact-us.
13+
** 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.
1616
**
1717
** GNU Lesser General Public License Usage
1818
** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -23,8 +23,8 @@
2323
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
2424
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
2525
**
26-
** In addition, as a special exception, Digia gives you certain additional
27-
** rights. These rights are described in the Digia Qt LGPL Exception
26+
** As a special exception, The Qt Company gives you certain additional
27+
** rights. These rights are described in The Qt Company LGPL Exception
2828
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
2929
**
3030
** $QT_END_LICENSE$

0 commit comments

Comments
 (0)