diff options
author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2012-07-30 11:52:18 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-01 11:22:04 +0200 |
commit | 6425d8b748225a36181c6e167487e497ecb3558e (patch) | |
tree | d0f05533d563da2e99719a38896a80e7f07f9532 /bin | |
parent | 8d2feb62ae8bac0fb620fa1d047f347be75fbe0e (diff) | |
download | qt4-tools-6425d8b748225a36181c6e167487e497ecb3558e.tar.gz |
Update contact information in license headers.
- Replace Nokia contact email address with Qt Project website.
- Remove "All rights reserved" line from license headers.
As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.
Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/createpackage.bat | 4 | ||||
-rwxr-xr-x | bin/createpackage.pl | 4 | ||||
-rwxr-xr-x | bin/elf2e32_qtwrapper.pl | 4 | ||||
-rwxr-xr-x | bin/patch_capabilities.pl | 4 | ||||
-rwxr-xr-x | bin/setcepaths.bat | 4 | ||||
-rwxr-xr-x | bin/syncqt | 46 | ||||
-rwxr-xr-x | bin/syncqt.bat | 4 |
7 files changed, 53 insertions, 17 deletions
diff --git a/bin/createpackage.bat b/bin/createpackage.bat index cd0480dd39..cf815b58a4 100755 --- a/bin/createpackage.bat +++ b/bin/createpackage.bat @@ -1,8 +1,7 @@ ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: :: :: Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -:: All rights reserved. -:: Contact: Nokia Corporation (qt-info@nokia.com) +:: Contact: http://www.qt-project.org/ :: :: This file is part of the test suite of the Qt Toolkit. :: @@ -35,6 +34,7 @@ :: :: :: +:: :: $QT_END_LICENSE$ :: ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: diff --git a/bin/createpackage.pl b/bin/createpackage.pl index c723e6574b..d4a953dfdd 100755 --- a/bin/createpackage.pl +++ b/bin/createpackage.pl @@ -2,8 +2,7 @@ ############################################################################# ## ## Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -## All rights reserved. -## Contact: Nokia Corporation (qt-info@nokia.com) +## Contact: http://www.qt-project.org/ ## ## This file is part of the S60 port of the Qt Toolkit. ## @@ -36,6 +35,7 @@ ## ## ## +## ## $QT_END_LICENSE$ ## ############################################################################# diff --git a/bin/elf2e32_qtwrapper.pl b/bin/elf2e32_qtwrapper.pl index e3e1cb1802..a9ea771181 100755 --- a/bin/elf2e32_qtwrapper.pl +++ b/bin/elf2e32_qtwrapper.pl @@ -2,8 +2,7 @@ ############################################################################# ## ## Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -## All rights reserved. -## Contact: Nokia Corporation (qt-info@nokia.com) +## Contact: http://www.qt-project.org/ ## ## This file is part of the utilities of the Qt Toolkit. ## @@ -36,6 +35,7 @@ ## ## ## +## ## $QT_END_LICENSE$ ## ############################################################################# diff --git a/bin/patch_capabilities.pl b/bin/patch_capabilities.pl index 07e45fc463..a5082a3219 100755 --- a/bin/patch_capabilities.pl +++ b/bin/patch_capabilities.pl @@ -2,8 +2,7 @@ ############################################################################# ## ## Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -## All rights reserved. -## Contact: Nokia Corporation (qt-info@nokia.com) +## Contact: http://www.qt-project.org/ ## ## This file is part of the S60 port of the Qt Toolkit. ## @@ -36,6 +35,7 @@ ## ## ## +## ## $QT_END_LICENSE$ ## ############################################################################# diff --git a/bin/setcepaths.bat b/bin/setcepaths.bat index 4c6a7e27a0..e9f588b69f 100755 --- a/bin/setcepaths.bat +++ b/bin/setcepaths.bat @@ -1,8 +1,7 @@ ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: :: :: Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -:: All rights reserved. -:: Contact: Nokia Corporation (qt-info@nokia.com) +:: Contact: http://www.qt-project.org/ :: :: This file is part of the tools applications of the Qt Toolkit. :: @@ -35,6 +34,7 @@ :: :: :: +:: :: $QT_END_LICENSE$ :: ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: diff --git a/bin/syncqt b/bin/syncqt index 05c4dfc541..65430a2ea7 100755 --- a/bin/syncqt +++ b/bin/syncqt @@ -1,12 +1,48 @@ #!/usr/bin/perl -w -###################################################################### +############################################################################# +## +## Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +## Contact: http://www.qt-project.org/ +## +## This file is part of the build configuration tools of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL$ +## GNU Lesser General Public License Usage +## This file may be used under the terms of the GNU Lesser General Public +## License version 2.1 as published by the Free Software Foundation and +## appearing in the file LICENSE.LGPL included in the packaging of this +## file. Please review the following information to ensure the GNU Lesser +## General Public License version 2.1 requirements will be met: +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## In addition, as a special exception, Nokia gives you certain additional +## rights. These rights are described in the Nokia Qt LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU General +## Public License version 3.0 as published by the Free Software Foundation +## and appearing in the file LICENSE.GPL included in the packaging of this +## file. Please review the following information to ensure the GNU General +## Public License version 3.0 requirements will be met: +## http://www.gnu.org/copyleft/gpl.html. +## +## Other Usage +## Alternatively, this file may be used in accordance with the terms and +## conditions contained in a signed written agreement between you and Nokia. +## +## +## +## +## +## +## $QT_END_LICENSE$ +## +############################################################################# + # # Synchronizes Qt header files - internal development tool. # -# Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -# Contact: Nokia Corporation (qt-info@nokia.com) -# -###################################################################### # use packages ------------------------------------------------------- use File::Basename; diff --git a/bin/syncqt.bat b/bin/syncqt.bat index 9a33772e74..d03da3b2fb 100755 --- a/bin/syncqt.bat +++ b/bin/syncqt.bat @@ -1,8 +1,7 @@ ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: :: :: Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -:: All rights reserved. -:: Contact: Nokia Corporation (qt-info@nokia.com) +:: Contact: http://www.qt-project.org/ :: :: This file is part of the tools applications of the Qt Toolkit. :: @@ -35,6 +34,7 @@ :: :: :: +:: :: $QT_END_LICENSE$ :: ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: |