License header update to GPL-EXCEPT

Change-Id: I6426c4e8f932cf26c6c638dec18d0c12e22972d1
Reviewed-by: Janne Anttila <janne.anttila@theqtcompany.com>

4 files changed, 49 insertions, 71 deletions

diff --git a/tests/test-installer/BatchSubstitute.bat b/tests/test-installer/BatchSubstitute.bat
index ba15fd6e5..50269b6ee 100644
--- a/tests/test-installer/BatchSubstitute.bat
+++ b/tests/test-installer/BatchSubstitute.bat
@@ -1,31 +1,25 @@
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 ::
-:: Copyright (C) 2016 The Qt Company Ltd.
+:: Copyright (C) 2017 The Qt Company Ltd.
 :: Contact: http://www.qt.io/licensing/
 ::
 :: This file is part of the Qt Installer Framework.
-::
-:: $QT_BEGIN_LICENSE:LGPL21$
+:: $QT_BEGIN_LICENSE:GPL-EXCEPT$
 :: 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.
+:: and conditions see https://www.qt.io/terms-conditions. For further
+:: information use the contact form at https://www.qt.io/contact-us.
 ::
-:: 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.
+:: GNU General Public License Usage
+:: Alternatively, this file may be used under the terms of the GNU
+:: General Public License version 3 as published by the Free Software
+:: Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+:: included in the packaging of this file. Please review the following
+:: information to ensure the GNU General Public License requirements will
+:: be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ::
 :: $QT_END_LICENSE$
 ::
diff --git a/tests/test-installer/auto_installations_script.qs b/tests/test-installer/auto_installations_script.qs
index 6d9188fd2..720295a7c 100644
--- a/tests/test-installer/auto_installations_script.qs
+++ b/tests/test-installer/auto_installations_script.qs
@@ -1,35 +1,30 @@
-/**************************************************************************
+/****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the Qt Installer Framework.
+** This file is part of the FOO module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
 ** 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
-**************************************************************************/
+****************************************************************************/
 
 var installerTargetDirectory="c:\\auto-test-installation";
 
diff --git a/tests/test-installer/create-test-installer.bat b/tests/test-installer/create-test-installer.bat
index 531825c70..3f99cdbac 100644
--- a/tests/test-installer/create-test-installer.bat
+++ b/tests/test-installer/create-test-installer.bat
@@ -1,31 +1,25 @@
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 ::
-:: Copyright (C) 2016 The Qt Company Ltd.
+:: Copyright (C) 2017 The Qt Company Ltd.
 :: Contact: http://www.qt.io/licensing/
 ::
 :: This file is part of the Qt Installer Framework.
-::
-:: $QT_BEGIN_LICENSE:LGPL21$
+:: $QT_BEGIN_LICENSE:GPL-EXCEPT$
 :: 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.
+:: and conditions see https://www.qt.io/terms-conditions. For further
+:: information use the contact form at https://www.qt.io/contact-us.
 ::
-:: 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.
+:: GNU General Public License Usage
+:: Alternatively, this file may be used under the terms of the GNU
+:: General Public License version 3 as published by the Free Software
+:: Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+:: included in the packaging of this file. Please review the following
+:: information to ensure the GNU General Public License requirements will
+:: be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ::
 :: $QT_END_LICENSE$
 ::
diff --git a/tests/test-installer/create-test-installer.sh b/tests/test-installer/create-test-installer.sh
index a2ba18ade..e513d082b 100755
--- a/tests/test-installer/create-test-installer.sh
+++ b/tests/test-installer/create-test-installer.sh
@@ -1,31 +1,26 @@
 #############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Qt Installer Framework.
 ##
-## $QT_BEGIN_LICENSE:LGPL21$
+## $QT_BEGIN_LICENSE:GPL-EXCEPT$
 ## 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.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://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.
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 as published by the Free Software
+## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##