Skip to content

Commit 61570cd

Browse files
Sergio AhumadaLars Knoll
Sergio Ahumada
authored and
Lars Knoll
committed
Change copyrights from Nokia to Digia
Change copyrights and license headers from Nokia to Digia Change-Id: I8b2ed2e09e9beb46bdda354017c29f00be6ae76f Reviewed-by: Akseli Salovaara <[email protected]> Reviewed-by: Lars Knoll <[email protected]>
1 parent 4b47afa commit 61570cd

File tree

9,574 files changed

+161536
-161612
lines changed

Some content is hidden

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

9,574 files changed

+161536
-161612
lines changed

‎bin/createpackage.bat

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
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 test suite of the Qt Toolkit.
87
::
98
:: $QT_BEGIN_LICENSE:LGPL$
10-
:: No Commercial Usage
11-
:: This file contains pre-release code and may not be distributed.
12-
:: You may use this file in accordance with the terms and conditions
13-
:: contained in the Technology Preview License Agreement accompanying
14-
:: this package.
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.
1516
::
1617
:: GNU Lesser General Public License Usage
1718
:: Alternatively, this file may be used under the terms of the GNU Lesser
@@ -21,18 +22,17 @@
2122
:: ensure the GNU Lesser General Public License version 2.1 requirements
2223
:: will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
2324
::
24-
:: In addition, as a special exception, Nokia gives you certain additional
25-
:: 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
2627
:: version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
2728
::
28-
:: If you have questions regarding the use of this file, please contact
29-
:: Nokia at [email protected].
30-
::
31-
::
32-
::
33-
::
34-
::
35-
::
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.
3636
::
3737
::
3838
:: $QT_END_LICENSE$

‎bin/createpackage.pl

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
#!/usr/bin/perl
22
#############################################################################
33
##
4-
## Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
5-
## All rights reserved.
6-
## Contact: Nokia Corporation ([email protected])
4+
## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
5+
## Contact: http://www.qt-project.org/legal
76
##
87
## This file is part of the S60 port of the Qt Toolkit.
98
##
109
## $QT_BEGIN_LICENSE:LGPL$
11-
## No Commercial Usage
12-
## This file contains pre-release code and may not be distributed.
13-
## You may use this file in accordance with the terms and conditions
14-
## contained in the Technology Preview License Agreement accompanying
15-
## this package.
10+
## Commercial License Usage
11+
## Licensees holding valid commercial Qt licenses may use this file in
12+
## accordance with the commercial license agreement provided with the
13+
## 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.
1617
##
1718
## GNU Lesser General Public License Usage
1819
## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -22,18 +23,17 @@
2223
## ensure the GNU Lesser General Public License version 2.1 requirements
2324
## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
2425
##
25-
## In addition, as a special exception, Nokia gives you certain additional
26-
## rights. These rights are described in the Nokia Qt LGPL Exception
26+
## In addition, as a special exception, Digia gives you certain additional
27+
## rights. These rights are described in the Digia Qt LGPL Exception
2728
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
2829
##
29-
## If you have questions regarding the use of this file, please contact
30-
## Nokia at [email protected].
31-
##
32-
##
33-
##
34-
##
35-
##
36-
##
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.
3737
##
3838
##
3939
## $QT_END_LICENSE$

‎bin/patch_capabilities.pl

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
#!/usr/bin/perl
22
#############################################################################
33
##
4-
## Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
5-
## All rights reserved.
6-
## Contact: Nokia Corporation ([email protected])
4+
## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
5+
## Contact: http://www.qt-project.org/legal
76
##
87
## This file is part of the S60 port of the Qt Toolkit.
98
##
109
## $QT_BEGIN_LICENSE:LGPL$
11-
## No Commercial Usage
12-
## This file contains pre-release code and may not be distributed.
13-
## You may use this file in accordance with the terms and conditions
14-
## contained in the Technology Preview License Agreement accompanying
15-
## this package.
10+
## Commercial License Usage
11+
## Licensees holding valid commercial Qt licenses may use this file in
12+
## accordance with the commercial license agreement provided with the
13+
## 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.
1617
##
1718
## GNU Lesser General Public License Usage
1819
## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -22,18 +23,17 @@
2223
## ensure the GNU Lesser General Public License version 2.1 requirements
2324
## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
2425
##
25-
## In addition, as a special exception, Nokia gives you certain additional
26-
## rights. These rights are described in the Nokia Qt LGPL Exception
26+
## In addition, as a special exception, Digia gives you certain additional
27+
## rights. These rights are described in the Digia Qt LGPL Exception
2728
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
2829
##
29-
## If you have questions regarding the use of this file, please contact
30-
## Nokia at [email protected].
31-
##
32-
##
33-
##
34-
##
35-
##
36-
##
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.
3737
##
3838
##
3939
## $QT_END_LICENSE$

‎bin/setcepaths.bat

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
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 tools applications of the Qt Toolkit.
87
::
98
:: $QT_BEGIN_LICENSE:LGPL$
10-
:: No Commercial Usage
11-
:: This file contains pre-release code and may not be distributed.
12-
:: You may use this file in accordance with the terms and conditions
13-
:: contained in the Technology Preview License Agreement accompanying
14-
:: this package.
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.
1516
::
1617
:: GNU Lesser General Public License Usage
1718
:: Alternatively, this file may be used under the terms of the GNU Lesser
@@ -21,18 +22,17 @@
2122
:: ensure the GNU Lesser General Public License version 2.1 requirements
2223
:: will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
2324
::
24-
:: In addition, as a special exception, Nokia gives you certain additional
25-
:: 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
2627
:: version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
2728
::
28-
:: If you have questions regarding the use of this file, please contact
29-
:: Nokia at [email protected].
30-
::
31-
::
32-
::
33-
::
34-
::
35-
::
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.
3636
::
3737
::
3838
:: $QT_END_LICENSE$

‎bin/syncqt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
#
44
# Synchronizes Qt header files - internal development tool.
55
#
6-
# Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
7-
# Contact: Nokia Corporation (qt-[email protected])
6+
# Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
7+
# Contact: http://www.qt-project.org/legal
88
#
99
######################################################################
1010

‎bin/syncqt.bat

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
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 tools applications of the Qt Toolkit.
87
::
98
:: $QT_BEGIN_LICENSE:LGPL$
10-
:: No Commercial Usage
11-
:: This file contains pre-release code and may not be distributed.
12-
:: You may use this file in accordance with the terms and conditions
13-
:: contained in the Technology Preview License Agreement accompanying
14-
:: this package.
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.
1516
::
1617
:: GNU Lesser General Public License Usage
1718
:: Alternatively, this file may be used under the terms of the GNU Lesser
@@ -21,18 +22,17 @@
2122
:: ensure the GNU Lesser General Public License version 2.1 requirements
2223
:: will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
2324
::
24-
:: In addition, as a special exception, Nokia gives you certain additional
25-
:: 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
2627
:: version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
2728
::
28-
:: If you have questions regarding the use of this file, please contact
29-
:: Nokia at [email protected].
30-
::
31-
::
32-
::
33-
::
34-
::
35-
::
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.
3636
::
3737
::
3838
:: $QT_END_LICENSE$

‎config.tests/mac/crc/main.cpp

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
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 config.tests of the Qt Toolkit.
87
**
98
** $QT_BEGIN_LICENSE:LGPL$
10-
** No Commercial Usage
11-
** This file contains pre-release code and may not be distributed.
12-
** You may use this file in accordance with the terms and conditions
13-
** contained in the Technology Preview License Agreement accompanying
14-
** this package.
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.
1516
**
1617
** GNU Lesser General Public License Usage
1718
** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -21,18 +22,17 @@
2122
** ensure the GNU Lesser General Public License version 2.1 requirements
2223
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
2324
**
24-
** In addition, as a special exception, Nokia gives you certain additional
25-
** 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
2627
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
2728
**
28-
** If you have questions regarding the use of this file, please contact
29-
** Nokia at [email protected].
30-
**
31-
**
32-
**
33-
**
34-
**
35-
**
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.
3636
**
3737
**
3838
** $QT_END_LICENSE$

‎config.tests/mac/xcodeversion.cpp

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
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 config.tests of the Qt Toolkit.
87
**
98
** $QT_BEGIN_LICENSE:LGPL$
10-
** No Commercial Usage
11-
** This file contains pre-release code and may not be distributed.
12-
** You may use this file in accordance with the terms and conditions
13-
** contained in the Technology Preview License Agreement accompanying
14-
** this package.
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.
1516
**
1617
** GNU Lesser General Public License Usage
1718
** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -21,18 +22,17 @@
2122
** ensure the GNU Lesser General Public License version 2.1 requirements
2223
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
2324
**
24-
** In addition, as a special exception, Nokia gives you certain additional
25-
** 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
2627
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
2728
**
28-
** If you have questions regarding the use of this file, please contact
29-
** Nokia at [email protected].
30-
**
31-
**
32-
**
33-
**
34-
**
35-
**
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.
3636
**
3737
**
3838
** $QT_END_LICENSE$

0 commit comments

Comments
 (0)