summaryrefslogtreecommitdiffstats
path: root/tests/test-installer
diff options
context:
space:
mode:
authorIikka Eklund <iikka.eklund@theqtcompany.com>2015-12-28 14:40:15 +0200
committerIikka Eklund <iikka.eklund@theqtcompany.com>2015-12-29 07:31:11 +0000
commit6ba58b42ab30f85928c141574defa35dfe255ef0 (patch)
tree787d56528e034efac9d74210f1e4c731a6685b71 /tests/test-installer
parent5a10f12751d64d1c75e006d39c9ca82e3063d8fd (diff)
Update license headers
Update existing license headers. LGPL -> LGPLv21. Update copyright year as well. Change-Id: Ie1d71f8c68186b8f625f409ddf94691f178093c9 Reviewed-by: Katja Marttila <katja.marttila@theqtcompany.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
Diffstat (limited to 'tests/test-installer')
-rw-r--r--tests/test-installer/BatchSubstitute.bat7
-rw-r--r--tests/test-installer/auto_installations_script.qs33
-rw-r--r--tests/test-installer/create-test-installer.bat7
-rwxr-xr-xtests/test-installer/create-test-installer.sh7
4 files changed, 42 insertions, 12 deletions
diff --git a/tests/test-installer/BatchSubstitute.bat b/tests/test-installer/BatchSubstitute.bat
index e0f24751e..ba15fd6e5 100644
--- a/tests/test-installer/BatchSubstitute.bat
+++ b/tests/test-installer/BatchSubstitute.bat
@@ -1,17 +1,17 @@
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
::
-:: Copyright (C) 2015 The Qt Company Ltd.
+:: Copyright (C) 2016 The Qt Company Ltd.
:: Contact: http://www.qt.io/licensing/
::
:: This file is part of the Qt Installer Framework.
::
-:: $QT_BEGIN_LICENSE:LGPL$
+:: $QT_BEGIN_LICENSE:LGPL21$
:: Commercial License Usage
:: Licensees holding valid commercial Qt licenses may use this file in
:: accordance with the commercial license agreement provided with the
:: Software or, alternatively, in accordance with the terms contained in
:: a written agreement between you and The Qt Company. For licensing terms
-:: and conditions see http://qt.io/terms-conditions. For further
+:: and conditions see http://www.qt.io/terms-conditions. For further
:: information use the contact form at http://www.qt.io/contact-us.
::
:: GNU Lesser General Public License Usage
@@ -27,7 +27,6 @@
:: rights. These rights are described in The Qt Company LGPL Exception
:: version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
::
-::
:: $QT_END_LICENSE$
::
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
diff --git a/tests/test-installer/auto_installations_script.qs b/tests/test-installer/auto_installations_script.qs
index 35960c3b5..6d9188fd2 100644
--- a/tests/test-installer/auto_installations_script.qs
+++ b/tests/test-installer/auto_installations_script.qs
@@ -1,3 +1,36 @@
+/**************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Installer Framework.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** 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 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.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+**************************************************************************/
+
var installerTargetDirectory="c:\\auto-test-installation";
function Controller()
diff --git a/tests/test-installer/create-test-installer.bat b/tests/test-installer/create-test-installer.bat
index 9bce051f0..531825c70 100644
--- a/tests/test-installer/create-test-installer.bat
+++ b/tests/test-installer/create-test-installer.bat
@@ -1,17 +1,17 @@
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
::
-:: Copyright (C) 2015 The Qt Company Ltd.
+:: Copyright (C) 2016 The Qt Company Ltd.
:: Contact: http://www.qt.io/licensing/
::
:: This file is part of the Qt Installer Framework.
::
-:: $QT_BEGIN_LICENSE:LGPL$
+:: $QT_BEGIN_LICENSE:LGPL21$
:: Commercial License Usage
:: Licensees holding valid commercial Qt licenses may use this file in
:: accordance with the commercial license agreement provided with the
:: Software or, alternatively, in accordance with the terms contained in
:: a written agreement between you and The Qt Company. For licensing terms
-:: and conditions see http://qt.io/terms-conditions. For further
+:: and conditions see http://www.qt.io/terms-conditions. For further
:: information use the contact form at http://www.qt.io/contact-us.
::
:: GNU Lesser General Public License Usage
@@ -27,7 +27,6 @@
:: rights. These rights are described in The Qt Company LGPL Exception
:: version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
::
-::
:: $QT_END_LICENSE$
::
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
diff --git a/tests/test-installer/create-test-installer.sh b/tests/test-installer/create-test-installer.sh
index afb1714cf..a2ba18ade 100755
--- a/tests/test-installer/create-test-installer.sh
+++ b/tests/test-installer/create-test-installer.sh
@@ -1,17 +1,17 @@
#############################################################################
##
-## Copyright (C) 2015 The Qt Company Ltd.
+## Copyright (C) 2016 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the Qt Installer Framework.
##
-## $QT_BEGIN_LICENSE:LGPL$
+## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://qt.io/terms-conditions. For further
+## and conditions see http://www.qt.io/terms-conditions. For further
## information use the contact form at http://www.qt.io/contact-us.
##
## GNU Lesser General Public License Usage
@@ -27,7 +27,6 @@
## rights. These rights are described in The Qt Company LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
-##
## $QT_END_LICENSE$
##
#############################################################################