Fix licensing

- Remove unnecessary license files and license header templates
- Tools and test are licensed under GPL-EXCEPT nowdays, update correct
license header there
- Update test data to match current license headers

Change-Id: Ia25c9e0989be326e0edeb0325af399edc26f0054
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

13 files changed, 154 insertions, 282 deletions

diff --git a/scripts/t/QtQA/PerlChecks.pm b/scripts/t/QtQA/PerlChecks.pm
index 4f22340f..8d568791 100644
--- a/scripts/t/QtQA/PerlChecks.pm
+++ b/scripts/t/QtQA/PerlChecks.pm
@@ -1,31 +1,26 @@
 #############################################################################
 ##
-## Copyright (C) 2015 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 Quality Assurance 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$
 ##
diff --git a/scripts/t/license-testdata/bad/multiple-header-one-wrong.s b/scripts/t/license-testdata/bad/multiple-header-one-wrong.s
index 8d9826e1..6b4b0174 100644
--- a/scripts/t/license-testdata/bad/multiple-header-one-wrong.s
+++ b/scripts/t/license-testdata/bad/multiple-header-one-wrong.s
@@ -1,31 +1,37 @@
 ;/****************************************************************************
 ;**
-;** Copyright (C) 2015 The Qt Company Ltd.
-;** Contact: Nokia Corporation (qt-info@nokia.com)
+;** Copyright (C) 2017 The Qt Company Ltd.
+;** Contact: https://www.qt.io/licensing/
 ;**
 ;** This file is part of the (whatever) of the Qt Toolkit.
 ;**
-;** $QT_BEGIN_LICENSE:LGPL21$
+;** $QT_BEGIN_LICENSE:LGPL$
 ;** 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 information 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.
+;** General Public License version 3 as published by the Free Software
+;** Foundation and appearing in the file LICENSE.LGPL3 included in the
+;** packaging of this file. Please review the following information to
+;** ensure the GNU Lesser General Public License version 3 requirements
+;** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+;**
+;** GNU General Public License Usage
+;** Alternatively, this file may be used under the terms of the GNU
+;** General Public License version 2.0 or (at your option) the GNU General
+;** Public license version 3 or any later version approved by the KDE Free
+;** Qt Foundation. The licenses are as published by the Free Software
+;** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+;** 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-2.0.html and
+;** https://www.gnu.org/licenses/gpl-3.0.html.
 ;**
 ;** $QT_END_LICENSE$
 ;**
@@ -40,7 +46,7 @@
 ;**
 ;** This file is part of the (whatever) of the Qt Toolkit.
 ;**
-;** $QT_BEGIN_LICENSE:LGPL21$
+;** $QT_BEGIN_LICENSE:LGPL$
 ;** Commercial License Usage
 ;** Licensees holding valid commercial Qt licenses may use this file in
 ;** accordance with the commercial license agreement provided with the
@@ -72,32 +78,38 @@
 
 ;/****************************************************************************
 ;**
-;** Copyright (C) 2015 The Qt Company Ltd.
-;** Contact: Nokia Corporation (qt-info@nokia.com)
+;** Copyright (C) 2017 The Qt Company Ltd.
+;** Contact: https://www.qt.io/licensing/
 ;**
 ;** This file is part of the (whatever) of the Qt Toolkit.
 ;**
-;** $QT_BEGIN_LICENSE:LGPL21$
+;** $QT_BEGIN_LICENSE:LGPL$
 ;** 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 information 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.
+;** General Public License version 3 as published by the Free Software
+;** Foundation and appearing in the file LICENSE.LGPL3 included in the
+;** packaging of this file. Please review the following information to
+;** ensure the GNU Lesser General Public License version 3 requirements
+;** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+;**
+;** GNU General Public License Usage
+;** Alternatively, this file may be used under the terms of the GNU
+;** General Public License version 2.0 or (at your option) the GNU General
+;** Public license version 3 or any later version approved by the KDE Free
+;** Qt Foundation. The licenses are as published by the Free Software
+;** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+;** 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-2.0.html and
+;** https://www.gnu.org/licenses/gpl-3.0.html.
 ;**
 ;** $QT_END_LICENSE$
 ;**
diff --git a/scripts/t/license-testdata/bad/old-contact-info.cpp b/scripts/t/license-testdata/bad/old-contact-info.cpp
index 337f2a8c..c80e4e79 100644
--- a/scripts/t/license-testdata/bad/old-contact-info.cpp
+++ b/scripts/t/license-testdata/bad/old-contact-info.cpp
@@ -1,31 +1,26 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the (whatever) 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$
 **
diff --git a/scripts/t/license-testdata/bad/wrong-lgpl-nokia.sh b/scripts/t/license-testdata/bad/wrong-lgpl-nokia.sh
index 96ea6910..c9f26b90 100644
--- a/scripts/t/license-testdata/bad/wrong-lgpl-nokia.sh
+++ b/scripts/t/license-testdata/bad/wrong-lgpl-nokia.sh
@@ -1,32 +1,27 @@
 ############################################################################
 ##
-## Copyright (C) 2015 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 (whatever) 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 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.
+## 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.
 ##
-## 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.
-## Other usage
 ## $QT_END_LICENSE$
 ##
 ############################################################################
diff --git a/scripts/t/license-testdata/expected-output.txt b/scripts/t/license-testdata/expected-output.txt
index d5f4b0a8..cf221e12 100644
--- a/scripts/t/license-testdata/expected-output.txt
+++ b/scripts/t/license-testdata/expected-output.txt
@@ -1,30 +1,36 @@
 #
-# Copyright (C) 2015 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 automated tests of the Qt Toolkit.
 #
-# $QT_BEGIN_LICENSE:LGPL21$
+# $QT_BEGIN_LICENSE:LGPL$
 # 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.
+# General Public License version 3 as published by the Free Software
+# Foundation and appearing in the file LICENSE.LGPL3 included in the
+# packaging of this file. Please review the following information to
+# ensure the GNU Lesser General Public License version 3 requirements
+# will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+#
+# GNU General Public License Usage
+# Alternatively, this file may be used under the terms of the GNU
+# General Public License version 2.0 or (at your option) the GNU General
+# Public license version 3 or any later version approved by the KDE Free
+# Qt Foundation. The licenses are as published by the Free Software
+# Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+# 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-2.0.html and
+# https://www.gnu.org/licenses/gpl-3.0.html.
 #
 # $QT_END_LICENSE$
 #
diff --git a/scripts/t/license-testdata/good/multiple-copyright-lgpl.g b/scripts/t/license-testdata/good/multiple-copyright-lgpl.g
index 6c6bec30..9620806f 100644
--- a/scripts/t/license-testdata/good/multiple-copyright-lgpl.g
+++ b/scripts/t/license-testdata/good/multiple-copyright-lgpl.g
@@ -2,31 +2,37 @@
 --
 -- Copyright (C) 2012 Alice
 -- Copyright (C) 2012 Bob
--- Contact: http://www.qt.io/licensing/
+-- Contact: https://www.qt.io/licensing/
 --
 -- This file is part of the (whatever) of the Qt Toolkit.
 --
--- $QT_BEGIN_LICENSE:LGPL21$
+-- $QT_BEGIN_LICENSE:LGPL$
 -- 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.
+-- General Public License version 3 as published by the Free Software
+-- Foundation and appearing in the file LICENSE.LGPL3 included in the
+-- packaging of this file. Please review the following information to
+-- ensure the GNU Lesser General Public License version 3 requirements
+-- will be met: https://www.gnu.org/licenses/lgpl-3.0.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 2.0 or (at your option) the GNU General
+-- Public license version 3 or any later version approved by the KDE Free
+-- Qt Foundation. The licenses are as published by the Free Software
+-- Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+-- 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-2.0.html and
+-- https://www.gnu.org/licenses/gpl-3.0.html.
 --
 -- $QT_END_LICENSE$
 --
diff --git a/scripts/t/license-testdata/good/multiple-headers.cpp b/scripts/t/license-testdata/good/multiple-headers.cpp
index d0f7e70c..e4d34e9f 100644
--- a/scripts/t/license-testdata/good/multiple-headers.cpp
+++ b/scripts/t/license-testdata/good/multiple-headers.cpp
@@ -1,31 +1,26 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 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 (whatever) 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$
 **
diff --git a/scripts/t/license-testdata/good/not-all-rights-reserved-nokia.cpp b/scripts/t/license-testdata/good/not-all-rights-reserved-nokia.cpp
index 1e750f8e..3a94c22b 100644
--- a/scripts/t/license-testdata/good/not-all-rights-reserved-nokia.cpp
+++ b/scripts/t/license-testdata/good/not-all-rights-reserved-nokia.cpp
@@ -1,31 +1,26 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 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 (whatever) 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$
 **
diff --git a/scripts/t/license-testdata/good/typical-lgpl-nokia.cpp b/scripts/t/license-testdata/good/typical-lgpl-nokia.cpp
index 1e750f8e..3a94c22b 100644
--- a/scripts/t/license-testdata/good/typical-lgpl-nokia.cpp
+++ b/scripts/t/license-testdata/good/typical-lgpl-nokia.cpp
@@ -1,31 +1,26 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 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 (whatever) 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$
 **
diff --git a/scripts/t/license-testdata/reference/header.BSD b/scripts/t/license-testdata/reference/header.BSD
deleted file mode 100644
index bbd476dc..00000000
--- a/scripts/t/license-testdata/reference/header.BSD
+++ /dev/null
@@ -1,40 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the FOO module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
diff --git a/scripts/t/license-testdata/reference/header.FDL b/scripts/t/license-testdata/reference/header.FDL
deleted file mode 100644
index 2df4fb5a..00000000
--- a/scripts/t/license-testdata/reference/header.FDL
+++ /dev/null
@@ -1,27 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** 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 Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
diff --git a/scripts/t/license-testdata/reference/header.LGPL-ONLY b/scripts/t/license-testdata/reference/header.LGPL-ONLY
deleted file mode 100644
index 9a676032..00000000
--- a/scripts/t/license-testdata/reference/header.LGPL-ONLY
+++ /dev/null
@@ -1,22 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the FOO module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL-ONLY$
-** GNU Lesser General Public License Usage
-** 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.
-**
-** If you have questions regarding the use of this file, please contact
-** us via http://www.qt.io/contact-us/.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
diff --git a/scripts/t/license-testdata/reference/header.LGPL21 b/scripts/t/license-testdata/reference/header.LGPL21
deleted file mode 100644
index 533390b0..00000000
--- a/scripts/t/license-testdata/reference/header.LGPL21
+++ /dev/null
@@ -1,33 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the FOO module of the Qt Toolkit.
-**
-** $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$
-**
-****************************************************************************/
-