diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2010-05-30 06:57:11 (GMT) |
---|---|---|
committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-05-30 06:57:11 (GMT) |
commit | 7ca5fac50034163c7e60c4aa809adda769c36762 (patch) | |
tree | becb6b15e62f18c49ca987f3ffb67a7c4d236f78 /bin | |
parent | 50eda57f06bd42ce56695ec9d55c33e7173904a7 (diff) | |
download | Qt-7ca5fac50034163c7e60c4aa809adda769c36762.zip Qt-7ca5fac50034163c7e60c4aa809adda769c36762.tar.gz Qt-7ca5fac50034163c7e60c4aa809adda769c36762.tar.bz2 |
Change to release licenses for 4.6.3.
Reviewed-by: Trust Me
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/createpackage.bat | 26 | ||||
-rwxr-xr-x | bin/createpackage.pl | 26 | ||||
-rwxr-xr-x | bin/patch_capabilities.pl | 26 | ||||
-rwxr-xr-x | bin/setcepaths.bat | 26 | ||||
-rwxr-xr-x | bin/syncqt.bat | 26 |
5 files changed, 65 insertions, 65 deletions
diff --git a/bin/createpackage.bat b/bin/createpackage.bat index 3960d13..bd54916 100755 --- a/bin/createpackage.bat +++ b/bin/createpackage.bat @@ -7,11 +7,11 @@ :: This file is part of the test suite of the Qt Toolkit. :: :: $QT_BEGIN_LICENSE:LGPL$ -:: No Commercial Usage -:: This file contains pre-release code and may not be distributed. -:: You may use this file in accordance with the terms and conditions -:: contained in the Technology Preview License Agreement accompanying -:: this package. +:: Commercial Usage +:: Licensees holding valid Qt Commercial licenses may use this file in +:: accordance with the Qt Commercial License Agreement provided with the +:: Software or, alternatively, in accordance with the terms contained in +:: a written agreement between you and Nokia. :: :: GNU Lesser General Public License Usage :: Alternatively, this file may be used under the terms of the GNU Lesser @@ -25,16 +25,16 @@ :: 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. +:: :: If you have questions regarding the use of this file, please contact :: Nokia at qt-info@nokia.com. -:: -:: -:: -:: -:: -:: -:: -:: :: $QT_END_LICENSE$ :: ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: diff --git a/bin/createpackage.pl b/bin/createpackage.pl index 7f803fd..7f4375f 100755 --- a/bin/createpackage.pl +++ b/bin/createpackage.pl @@ -8,11 +8,11 @@ ## This file is part of the S60 port of the Qt Toolkit. ## ## $QT_BEGIN_LICENSE:LGPL$ -## No Commercial Usage -## This file contains pre-release code and may not be distributed. -## You may use this file in accordance with the terms and conditions -## contained in the Technology Preview License Agreement accompanying -## this package. +## Commercial Usage +## Licensees holding valid Qt Commercial licenses may use this file in +## accordance with the Qt Commercial License Agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and Nokia. ## ## GNU Lesser General Public License Usage ## Alternatively, this file may be used under the terms of the GNU Lesser @@ -26,16 +26,16 @@ ## 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. +## ## If you have questions regarding the use of this file, please contact ## Nokia at qt-info@nokia.com. -## -## -## -## -## -## -## -## ## $QT_END_LICENSE$ ## ############################################################################# diff --git a/bin/patch_capabilities.pl b/bin/patch_capabilities.pl index f82c48f..939840d 100755 --- a/bin/patch_capabilities.pl +++ b/bin/patch_capabilities.pl @@ -8,11 +8,11 @@ ## This file is part of the S60 port of the Qt Toolkit. ## ## $QT_BEGIN_LICENSE:LGPL$ -## No Commercial Usage -## This file contains pre-release code and may not be distributed. -## You may use this file in accordance with the terms and conditions -## contained in the Technology Preview License Agreement accompanying -## this package. +## Commercial Usage +## Licensees holding valid Qt Commercial licenses may use this file in +## accordance with the Qt Commercial License Agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and Nokia. ## ## GNU Lesser General Public License Usage ## Alternatively, this file may be used under the terms of the GNU Lesser @@ -26,16 +26,16 @@ ## 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. +## ## If you have questions regarding the use of this file, please contact ## Nokia at qt-info@nokia.com. -## -## -## -## -## -## -## -## ## $QT_END_LICENSE$ ## ############################################################################# diff --git a/bin/setcepaths.bat b/bin/setcepaths.bat index bbabfee..a17aa25 100755 --- a/bin/setcepaths.bat +++ b/bin/setcepaths.bat @@ -7,11 +7,11 @@ :: This file is part of the tools applications of the Qt Toolkit. :: :: $QT_BEGIN_LICENSE:LGPL$ -:: No Commercial Usage -:: This file contains pre-release code and may not be distributed. -:: You may use this file in accordance with the terms and conditions -:: contained in the Technology Preview License Agreement accompanying -:: this package. +:: Commercial Usage +:: Licensees holding valid Qt Commercial licenses may use this file in +:: accordance with the Qt Commercial License Agreement provided with the +:: Software or, alternatively, in accordance with the terms contained in +:: a written agreement between you and Nokia. :: :: GNU Lesser General Public License Usage :: Alternatively, this file may be used under the terms of the GNU Lesser @@ -25,16 +25,16 @@ :: 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. +:: :: If you have questions regarding the use of this file, please contact :: Nokia at qt-info@nokia.com. -:: -:: -:: -:: -:: -:: -:: -:: :: $QT_END_LICENSE$ :: ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: diff --git a/bin/syncqt.bat b/bin/syncqt.bat index bd89c2c..4648d8f 100755 --- a/bin/syncqt.bat +++ b/bin/syncqt.bat @@ -7,11 +7,11 @@ :: This file is part of the tools applications of the Qt Toolkit. :: :: $QT_BEGIN_LICENSE:LGPL$ -:: No Commercial Usage -:: This file contains pre-release code and may not be distributed. -:: You may use this file in accordance with the terms and conditions -:: contained in the Technology Preview License Agreement accompanying -:: this package. +:: Commercial Usage +:: Licensees holding valid Qt Commercial licenses may use this file in +:: accordance with the Qt Commercial License Agreement provided with the +:: Software or, alternatively, in accordance with the terms contained in +:: a written agreement between you and Nokia. :: :: GNU Lesser General Public License Usage :: Alternatively, this file may be used under the terms of the GNU Lesser @@ -25,16 +25,16 @@ :: 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. +:: :: If you have questions regarding the use of this file, please contact :: Nokia at qt-info@nokia.com. -:: -:: -:: -:: -:: -:: -:: -:: :: $QT_END_LICENSE$ :: ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: |