Skip to content

Commit 0be9511

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: Ie6697ab48e42676c1d782b8d0075ade1269f45dd Reviewed-by: Akseli Salovaara <[email protected]> Reviewed-by: Lars Knoll <[email protected]>
1 parent 335d724 commit 0be9511

File tree

11,497 files changed

+207618
-207703
lines changed

Some content is hidden

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

11,497 files changed

+207618
-207703
lines changed

‎bin/createpackage.bat

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 test suite 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$

‎bin/createpackage.pl

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
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$
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.
17+
##
1118
## GNU Lesser General Public License Usage
12-
## This file may be used under the terms of the GNU Lesser General Public
13-
## License version 2.1 as published by the Free Software Foundation and
14-
## appearing in the file LICENSE.LGPL included in the packaging of this
15-
## file. Please review the following information to ensure the GNU Lesser
16-
## General Public License version 2.1 requirements will be met:
17-
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
19+
## 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.
1825
##
19-
## In addition, as a special exception, Nokia gives you certain additional
20-
## 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
2128
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
2229
##
2330
## GNU General Public License Usage
24-
## Alternatively, this file may be used under the terms of the GNU General
25-
## Public License version 3.0 as published by the Free Software Foundation
26-
## and appearing in the file LICENSE.GPL included in the packaging of this
27-
## file. Please review the following information to ensure the GNU General
28-
## Public License version 3.0 requirements will be met:
29-
## http://www.gnu.org/copyleft/gpl.html.
30-
##
31-
## Other Usage
32-
## Alternatively, this file may be used in accordance with the terms and
33-
## conditions contained in a signed written agreement between you and Nokia.
34-
##
35-
##
36-
##
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/elf2e32_qtwrapper.pl

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
11
#!/usr/bin/perl -w
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$
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.
17+
##
1118
## GNU Lesser General Public License Usage
12-
## This file may be used under the terms of the GNU Lesser General Public
13-
## License version 2.1 as published by the Free Software Foundation and
14-
## appearing in the file LICENSE.LGPL included in the packaging of this
15-
## file. Please review the following information to ensure the GNU Lesser
16-
## General Public License version 2.1 requirements will be met:
17-
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
19+
## 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.
1825
##
19-
## In addition, as a special exception, Nokia gives you certain additional
20-
## 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
2128
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
2229
##
2330
## GNU General Public License Usage
24-
## Alternatively, this file may be used under the terms of the GNU General
25-
## Public License version 3.0 as published by the Free Software Foundation
26-
## and appearing in the file LICENSE.GPL included in the packaging of this
27-
## file. Please review the following information to ensure the GNU General
28-
## Public License version 3.0 requirements will be met:
29-
## http://www.gnu.org/copyleft/gpl.html.
30-
##
31-
## Other Usage
32-
## Alternatively, this file may be used in accordance with the terms and
33-
## conditions contained in a signed written agreement between you and Nokia.
34-
##
35-
##
36-
##
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: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
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$
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.
17+
##
1118
## GNU Lesser General Public License Usage
12-
## This file may be used under the terms of the GNU Lesser General Public
13-
## License version 2.1 as published by the Free Software Foundation and
14-
## appearing in the file LICENSE.LGPL included in the packaging of this
15-
## file. Please review the following information to ensure the GNU Lesser
16-
## General Public License version 2.1 requirements will be met:
17-
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
19+
## 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.
1825
##
19-
## In addition, as a special exception, Nokia gives you certain additional
20-
## 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
2128
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
2229
##
2330
## GNU General Public License Usage
24-
## Alternatively, this file may be used under the terms of the GNU General
25-
## Public License version 3.0 as published by the Free Software Foundation
26-
## and appearing in the file LICENSE.GPL included in the packaging of this
27-
## file. Please review the following information to ensure the GNU General
28-
## Public License version 3.0 requirements will be met:
29-
## http://www.gnu.org/copyleft/gpl.html.
30-
##
31-
## Other Usage
32-
## Alternatively, this file may be used in accordance with the terms and
33-
## conditions contained in a signed written agreement between you and Nokia.
34-
##
35-
##
36-
##
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: 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 tools applications 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$

‎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: 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 tools applications 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$

0 commit comments

Comments
 (0)