summaryrefslogtreecommitdiffstats
path: root/tests/test-installer
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@theqtcompany.com>2014-10-16 11:51:47 +0200
committerKai Koehne <kai.koehne@theqtcompany.com>2014-10-16 15:17:56 +0200
commit4ebfecf411c02cf8c357f29b28f2e17a3a843c19 (patch)
treee759a32675e7da6a950700c226797b227723457b /tests/test-installer
parent18e63cee0683423ea6edec361fb057654dbaade0 (diff)
Add LGPLv3 as new license
Change-Id: I61158f956894e209dccf83744b4753774676099d Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
Diffstat (limited to 'tests/test-installer')
-rw-r--r--tests/test-installer/BatchSubstitute.bat23
-rw-r--r--tests/test-installer/create-test-installer.bat23
-rwxr-xr-xtests/test-installer/create-test-installer.sh21
3 files changed, 23 insertions, 44 deletions
diff --git a/tests/test-installer/BatchSubstitute.bat b/tests/test-installer/BatchSubstitute.bat
index 42333eb26..9b7dc1515 100644
--- a/tests/test-installer/BatchSubstitute.bat
+++ b/tests/test-installer/BatchSubstitute.bat
@@ -1,6 +1,6 @@
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
::
-:: Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+:: Copyright (C) 2012-2014 Digia Plc and/or its subsidiary(-ies).
:: Contact: http://www.qt-project.org/legal
::
:: This file is part of the Qt Installer Framework.
@@ -16,24 +16,17 @@
::
:: 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.
+:: General Public License version 2.1 or version 3 as published by the Free
+:: Software Foundation and appearing in the file LICENSE.LGPLv21 and
+:: LICENSE.LGPLv3 included in the packaging of this file. Please review the
+:: following information to ensure the GNU Lesser General Public License
+:: requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+:: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
::
:: In addition, as a special exception, Digia gives you certain additional
-:: rights. These rights are described in the Digia Qt LGPL Exception
+:: rights. These rights are described in the Digia 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.
-::
::
:: $QT_END_LICENSE$
::
diff --git a/tests/test-installer/create-test-installer.bat b/tests/test-installer/create-test-installer.bat
index eb9ac9dc8..5aa1b0c1b 100644
--- a/tests/test-installer/create-test-installer.bat
+++ b/tests/test-installer/create-test-installer.bat
@@ -1,6 +1,6 @@
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
::
-:: Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+:: Copyright (C) 2012-2014 Digia Plc and/or its subsidiary(-ies).
:: Contact: http://www.qt-project.org/legal
::
:: This file is part of the Qt Installer Framework.
@@ -16,24 +16,17 @@
::
:: 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.
+:: General Public License version 2.1 or version 3 as published by the Free
+:: Software Foundation and appearing in the file LICENSE.LGPLv21 and
+:: LICENSE.LGPLv3 included in the packaging of this file. Please review the
+:: following information to ensure the GNU Lesser General Public License
+:: requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+:: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
::
:: In addition, as a special exception, Digia gives you certain additional
-:: rights. These rights are described in the Digia Qt LGPL Exception
+:: rights. These rights are described in the Digia 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.
-::
::
:: $QT_END_LICENSE$
::
diff --git a/tests/test-installer/create-test-installer.sh b/tests/test-installer/create-test-installer.sh
index e3c3613d5..e8b93d19a 100755
--- a/tests/test-installer/create-test-installer.sh
+++ b/tests/test-installer/create-test-installer.sh
@@ -16,24 +16,17 @@
##
## 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.
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
## In addition, as a special exception, Digia gives you certain additional
-## rights. These rights are described in the Digia Qt LGPL Exception
+## rights. These rights are described in the Digia 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.
-##
##
## $QT_END_LICENSE$
##