summaryrefslogtreecommitdiffstats
path: root/tests/auto/qsslcertificate/certificates
diff options
context:
space:
mode:
authorJyri Tahtela <jyri.tahtela@nokia.com>2011-05-13 08:39:50 (GMT)
committerJyri Tahtela <jyri.tahtela@nokia.com>2011-05-13 08:39:50 (GMT)
commit8e6e571c6245ba30449aae6a8da5f1c26d5abee6 (patch)
treede528ec9a72cdb52b6214de66fd398bb1807a346 /tests/auto/qsslcertificate/certificates
parent004ad12669ef696eeba70fd57d1eb0c67c806d1d (diff)
downloadQt-8e6e571c6245ba30449aae6a8da5f1c26d5abee6.zip
Qt-8e6e571c6245ba30449aae6a8da5f1c26d5abee6.tar.gz
Qt-8e6e571c6245ba30449aae6a8da5f1c26d5abee6.tar.bz2
Update licenseheader text in source files
Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
Diffstat (limited to 'tests/auto/qsslcertificate/certificates')
-rwxr-xr-xtests/auto/qsslcertificate/certificates/gencertificates.sh34
1 files changed, 17 insertions, 17 deletions
diff --git a/tests/auto/qsslcertificate/certificates/gencertificates.sh b/tests/auto/qsslcertificate/certificates/gencertificates.sh
index e705785..9f873d9 100755
--- a/tests/auto/qsslcertificate/certificates/gencertificates.sh
+++ b/tests/auto/qsslcertificate/certificates/gencertificates.sh
@@ -8,29 +8,29 @@
## This file is the build configuration utility 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.
-##
## GNU Lesser General Public License Usage
-## Alternatively, 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.
+## 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
+## rights. These rights are described in the Nokia Qt LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
-## If you have questions regarding the use of this file, please contact
-## Nokia at qt-info@nokia.com.
-##
-##
+## 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.
##
##
##