Skip to content

Commit 335d724

Browse files
Sergio AhumadaLars Knoll
Sergio Ahumada
authored and
Lars Knoll
committed
Change licenses and license headers from Nokia to Digia
Change copyrights and license headers from Nokia to Digia Change-Id: I5fbe31f29f13cf0bb190e52036e2954ec20c40b9 Reviewed-by: Iikka Eklund <[email protected]> Reviewed-by: Akseli Salovaara <[email protected]> Reviewed-by: Lars Knoll <[email protected]>
1 parent 3488f1d commit 335d724

7 files changed

+186
-187
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: 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 GUI Toolkit is Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
4-
Contact: Nokia Corporation (qt-[email protected])
3+
The Qt Toolkit is Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
4+
Contact: http://www.qt-project.org/legal
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.PREVIEW.COMMERCIAL

Lines changed: 133 additions & 134 deletions
Large diffs are not rendered by default.

‎header.BSD

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
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 FOO module 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
****************************************************************************/

‎header.FDL

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
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 documentation of the Qt Toolkit.
87
**
98
** $QT_BEGIN_LICENSE:FDL$
10-
** GNU Free Documentation License
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+
**
17+
** GNU Free Documentation License Usage
1118
** Alternatively, this file may be used under the terms of the GNU Free
1219
** Documentation License version 1.3 as published by the Free Software
1320
** Foundation and appearing in the file included in the packaging of
14-
** this file.
15-
**
16-
** Other Usage
17-
** Alternatively, this file may be used in accordance with the terms
18-
** and conditions contained in a signed written agreement between you
19-
** and Nokia.
20-
**
21-
**
22-
**
23-
**
21+
** this file. Please review the following information to ensure
22+
** the GNU Free Documentation License version 1.3 requirements
23+
** will be met: http://www.gnu.org/copyleft/fdl.html.
2424
** $QT_END_LICENSE$
2525
**
2626
****************************************************************************/

‎header.LGPL

Lines changed: 25 additions & 25 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 FOO 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.
17-
**
18-
** In addition, as a special exception, Nokia gives you certain additional
19-
** rights. These rights are described in the Nokia Qt LGPL Exception
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.
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
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$

‎header.LGPL-ONLY

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
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 FOO module of the Qt Toolkit.
87
**
@@ -16,7 +15,8 @@
1615
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
1716
**
1817
** If you have questions regarding the use of this file, please contact
19-
** Nokia at [email protected].
18+
** us via http://www.qt-project.org/.
19+
**
2020
** $QT_END_LICENSE$
2121
**
2222
****************************************************************************/

0 commit comments

Comments
 (0)