Skip to content

Commit 448b65a

Browse files
Iikka EklundLars Knoll
Iikka Eklund
authored and
Lars Knoll
committed
Change copyrights from Nokia to Digia
Change copyrights and license headers from Nokia to Digia Change-Id: I443b23648642c842c184dfa4538fdc016a29f201 Reviewed-by: Sergio Ahumada <[email protected]> Reviewed-by: Janne Anttila <[email protected]> Reviewed-by: Lars Knoll <[email protected]>
1 parent 1e6bdf8 commit 448b65a

File tree

13 files changed

+339
-340
lines changed

13 files changed

+339
-340
lines changed

‎LGPL_EXCEPTION.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Nokia Qt LGPL Exception version 1.1
1+
Digia 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.LGPL

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

3-
The Qt GUI Toolkit is Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
3+
The Qt Toolkit is Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
44
Contact: http://www.qt-project.org/
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.
88

99
-------------------------------------------------------------------------
1010

11-
GNU LESSER GENERAL PUBLIC LICENSE
12-
Version 2.1, February 1999
11+
GNU LESSER GENERAL PUBLIC LICENSE
12+
Version 2.1, February 1999
1313

1414
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
1515
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
@@ -20,7 +20,7 @@
2020
as the successor of the GNU Library Public License, version 2, hence
2121
the version number 2.1.]
2222

23-
Preamble
23+
Preamble
2424

2525
The licenses for most software are designed to take away your
2626
freedom to share and change it. By contrast, the GNU General Public
@@ -122,7 +122,7 @@ modification follow. Pay close attention to the difference between a
122122
former contains code derived from the library, whereas the latter must
123123
be combined with the library in order to run.
124124

125-
GNU LESSER GENERAL PUBLIC LICENSE
125+
GNU LESSER GENERAL PUBLIC LICENSE
126126
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
127127

128128
0. This License Agreement applies to any software library or other
@@ -156,7 +156,7 @@ such a program is covered only if its contents constitute a work based
156156
on the Library (independent of the use of the Library in a tool for
157157
writing it). Whether that is true depends on what the Library does
158158
and what the program that uses the Library does.
159-
159+
160160
1. You may copy and distribute verbatim copies of the Library's
161161
complete source code as you receive it, in any medium, provided that
162162
you conspicuously and appropriately publish on each copy an
@@ -442,7 +442,7 @@ decision will be guided by the two goals of preserving the free status
442442
of all derivatives of our free software and of promoting the sharing
443443
and reuse of software generally.
444444

445-
NO WARRANTY
445+
NO WARRANTY
446446

447447
15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
448448
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -465,7 +465,7 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
465465
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
466466
DAMAGES.
467467

468-
END OF TERMS AND CONDITIONS
468+
END OF TERMS AND CONDITIONS
469469

470470
How to Apply These Terms to Your New Libraries
471471

‎LICENSE.PREVIEW.COMMERCIAL

Lines changed: 139 additions & 140 deletions
Large diffs are not rendered by default.

‎examples/qftp/ftpwindow.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
/****************************************************************************
22
**
3-
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
4-
** All rights reserved.
5-
** Contact: Nokia Corporation ([email protected])
3+
** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
4+
** Contact: http://www.qt-project.org/legal
65
**
76
** This file is part of the examples of the Qt Toolkit.
87
**
@@ -18,10 +17,10 @@
1817
** notice, this list of conditions and the following disclaimer in
1918
** the documentation and/or other materials provided with the
2019
** distribution.
21-
** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
22-
** the names of its contributors may be used to endorse or promote
23-
** products derived from this software without specific prior written
24-
** permission.
20+
** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
21+
** of its contributors may be used to endorse or promote products derived
22+
** from this software without specific prior written permission.
23+
**
2524
**
2625
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
2726
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -34,6 +33,7 @@
3433
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
3534
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
3635
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
36+
**
3737
** $QT_END_LICENSE$
3838
**
3939
****************************************************************************/

‎examples/qftp/ftpwindow.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
/****************************************************************************
22
**
3-
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
4-
** All rights reserved.
5-
** Contact: Nokia Corporation ([email protected])
3+
** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
4+
** Contact: http://www.qt-project.org/legal
65
**
76
** This file is part of the examples of the Qt Toolkit.
87
**
@@ -18,10 +17,10 @@
1817
** notice, this list of conditions and the following disclaimer in
1918
** the documentation and/or other materials provided with the
2019
** distribution.
21-
** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
22-
** the names of its contributors may be used to endorse or promote
23-
** products derived from this software without specific prior written
24-
** permission.
20+
** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
21+
** of its contributors may be used to endorse or promote products derived
22+
** from this software without specific prior written permission.
23+
**
2524
**
2625
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
2726
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -34,6 +33,7 @@
3433
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
3534
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
3635
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
36+
**
3737
** $QT_END_LICENSE$
3838
**
3939
****************************************************************************/

‎examples/qftp/main.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
/****************************************************************************
22
**
3-
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
4-
** All rights reserved.
5-
** Contact: Nokia Corporation ([email protected])
3+
** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
4+
** Contact: http://www.qt-project.org/legal
65
**
76
** This file is part of the examples of the Qt Toolkit.
87
**
@@ -18,10 +17,10 @@
1817
** notice, this list of conditions and the following disclaimer in
1918
** the documentation and/or other materials provided with the
2019
** distribution.
21-
** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
22-
** the names of its contributors may be used to endorse or promote
23-
** products derived from this software without specific prior written
24-
** permission.
20+
** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
21+
** of its contributors may be used to endorse or promote products derived
22+
** from this software without specific prior written permission.
23+
**
2524
**
2625
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
2726
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -34,6 +33,7 @@
3433
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
3534
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
3635
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
36+
**
3737
** $QT_END_LICENSE$
3838
**
3939
****************************************************************************/

‎src/qftp/qftp.cpp

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
/****************************************************************************
22
**
3-
** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
4-
** All rights reserved.
5-
** Contact: Nokia Corporation ([email protected])
3+
** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
4+
** Contact: http://www.qt-project.org/legal
65
**
76
** This file is part of the QtNetwork module of the Qt Toolkit.
87
**
98
** $QT_BEGIN_LICENSE:LGPL$
9+
** Commercial License Usage
10+
** Licensees holding valid commercial Qt licenses may use this file in
11+
** accordance with the commercial license agreement provided with the
12+
** 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.
16+
**
1017
** GNU Lesser General Public License Usage
11-
** This file may be used under the terms of the GNU Lesser General Public
12-
** License version 2.1 as published by the Free Software Foundation and
13-
** appearing in the file LICENSE.LGPL included in the packaging of this
14-
** file. Please review the following information to ensure the GNU Lesser
15-
** General Public License version 2.1 requirements will be met:
16-
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
18+
** 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.
1724
**
18-
** In addition, as a special exception, Nokia gives you certain additional
19-
** rights. These rights are described in the Nokia Qt LGPL Exception
25+
** In addition, as a special exception, Digia gives you certain additional
26+
** rights. These rights are described in the Digia Qt LGPL Exception
2027
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
2128
**
2229
** GNU General Public License Usage
23-
** Alternatively, this file may be used under the terms of the GNU General
24-
** Public License version 3.0 as published by the Free Software Foundation
25-
** and appearing in the file LICENSE.GPL included in the packaging of this
26-
** file. Please review the following information to ensure the GNU General
27-
** Public License version 3.0 requirements will be met:
28-
** http://www.gnu.org/copyleft/gpl.html.
29-
**
30-
** Other Usage
31-
** Alternatively, this file may be used in accordance with the terms and
32-
** conditions contained in a signed written agreement between you and Nokia.
33-
**
34-
**
35-
**
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.
3636
**
3737
**
3838
** $QT_END_LICENSE$

‎src/qftp/qftp.h

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
/****************************************************************************
22
**
3-
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
4-
** All rights reserved.
5-
** Contact: Nokia Corporation ([email protected])
3+
** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
4+
** Contact: http://www.qt-project.org/legal
65
**
76
** This file is part of the QtNetwork module of the Qt Toolkit.
87
**
98
** $QT_BEGIN_LICENSE:LGPL$
9+
** Commercial License Usage
10+
** Licensees holding valid commercial Qt licenses may use this file in
11+
** accordance with the commercial license agreement provided with the
12+
** 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.
16+
**
1017
** GNU Lesser General Public License Usage
11-
** This file may be used under the terms of the GNU Lesser General Public
12-
** License version 2.1 as published by the Free Software Foundation and
13-
** appearing in the file LICENSE.LGPL included in the packaging of this
14-
** file. Please review the following information to ensure the GNU Lesser
15-
** General Public License version 2.1 requirements will be met:
16-
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
18+
** 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.
1724
**
18-
** In addition, as a special exception, Nokia gives you certain additional
19-
** rights. These rights are described in the Nokia Qt LGPL Exception
25+
** In addition, as a special exception, Digia gives you certain additional
26+
** rights. These rights are described in the Digia Qt LGPL Exception
2027
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
2128
**
2229
** GNU General Public License Usage
23-
** Alternatively, this file may be used under the terms of the GNU General
24-
** Public License version 3.0 as published by the Free Software Foundation
25-
** and appearing in the file LICENSE.GPL included in the packaging of this
26-
** file. Please review the following information to ensure the GNU General
27-
** Public License version 3.0 requirements will be met:
28-
** http://www.gnu.org/copyleft/gpl.html.
29-
**
30-
** Other Usage
31-
** Alternatively, this file may be used in accordance with the terms and
32-
** conditions contained in a signed written agreement between you and Nokia.
33-
**
34-
**
35-
**
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.
3636
**
3737
**
3838
** $QT_END_LICENSE$

‎src/qftp/qurlinfo.cpp

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
/****************************************************************************
22
**
3-
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
4-
** Contact: http://www.qt-project.org/
3+
** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
4+
** Contact: http://www.qt-project.org/legal
55
**
66
** This file is part of the QtNetwork module of the Qt Toolkit.
77
**
88
** $QT_BEGIN_LICENSE:LGPL$
9+
** Commercial License Usage
10+
** Licensees holding valid commercial Qt licenses may use this file in
11+
** accordance with the commercial license agreement provided with the
12+
** 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.
16+
**
917
** GNU Lesser General Public License Usage
10-
** This file may be used under the terms of the GNU Lesser General Public
11-
** License version 2.1 as published by the Free Software Foundation and
12-
** appearing in the file LICENSE.LGPL included in the packaging of this
13-
** file. Please review the following information to ensure the GNU Lesser
14-
** General Public License version 2.1 requirements will be met:
15-
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
18+
** 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.
1624
**
17-
** In addition, as a special exception, Nokia gives you certain additional
18-
** rights. These rights are described in the Nokia Qt LGPL Exception
25+
** In addition, as a special exception, Digia gives you certain additional
26+
** rights. These rights are described in the Digia Qt LGPL Exception
1927
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
2028
**
2129
** GNU General Public License Usage
22-
** Alternatively, this file may be used under the terms of the GNU General
23-
** Public License version 3.0 as published by the Free Software Foundation
24-
** and appearing in the file LICENSE.GPL included in the packaging of this
25-
** file. Please review the following information to ensure the GNU General
26-
** Public License version 3.0 requirements will be met:
27-
** http://www.gnu.org/copyleft/gpl.html.
28-
**
29-
** Other Usage
30-
** Alternatively, this file may be used in accordance with the terms and
31-
** conditions contained in a signed written agreement between you and Nokia.
32-
**
33-
**
34-
**
35-
**
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.
3636
**
3737
**
3838
** $QT_END_LICENSE$

0 commit comments

Comments
 (0)