Update copyright headers

Qt copyrights are now in The Qt Company, so we could update the source
code headers accordingly. In the same go we should also fix the links to
point to qt.io.

Change-Id: I5999ee256134fe82ab13f6f06fcd1d0aa150b688
Reviewed-by: Sergio Ahumada <sahumada@texla.cl>

17 files changed, 130 insertions, 146 deletions

diff --git a/scripts/t/QtQA/PerlChecks.pm b/scripts/t/QtQA/PerlChecks.pm
index d2d5dfe7..ba2e2477 100644
--- a/scripts/t/QtQA/PerlChecks.pm
+++ b/scripts/t/QtQA/PerlChecks.pm
@@ -1,40 +1,32 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-## Contact: http://www.qt-project.org/legal
+## Copyright (C) 2015 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the Quality Assurance module of the Qt Toolkit.
 ##
-## $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 Digia.  For licensing terms and
-## conditions see http://qt.digia.com/licensing.  For further information
-## use the contact form at http://qt.digia.com/contact-us.
+## 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 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
+## 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.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/scripts/t/license-testdata/bad/missing-license-info.qdoc b/scripts/t/license-testdata/bad/missing-license-info.qdoc
index 07da8c4e..c168962a 100644
--- a/scripts/t/license-testdata/bad/missing-license-info.qdoc
+++ b/scripts/t/license-testdata/bad/missing-license-info.qdoc
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the (whatever) of the Qt Toolkit.
 **
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 228ed584..8d9826e1 100644
--- a/scripts/t/license-testdata/bad/multiple-header-one-wrong.s
+++ b/scripts/t/license-testdata/bad/multiple-header-one-wrong.s
@@ -1,6 +1,6 @@
 ;/****************************************************************************
 ;**
-;** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+;** Copyright (C) 2015 The Qt Company Ltd.
 ;** Contact: Nokia Corporation (qt-info@nokia.com)
 ;**
 ;** This file is part of the (whatever) of the Qt Toolkit.
@@ -10,9 +10,9 @@
 ;** 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 Digia. For licensing terms and
-;** conditions see http://qt.digia.com/licensing. For further information
-;** use the contact form at http://qt.digia.com/contact-us.
+;** 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.
 ;**
 ;** GNU Lesser General Public License Usage
 ;** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -23,8 +23,8 @@
 ;** 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
+;** 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$
@@ -36,7 +36,7 @@
 ;/****************************************************************************
 ;**
 ;** Copyright (C) 2012 Fake Corporation and/or its subsidiary(-ies).
-;** Contact: http://www.qt-project.org/legal
+;** Contact: http://www.qt.io/licensing/
 ;**
 ;** This file is part of the (whatever) of the Qt Toolkit.
 ;**
@@ -45,9 +45,9 @@
 ;** 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 Digia. For licensing terms and
-;** conditions see http://qt.digia.com/licensing. For further information
-;** use the contact form at http://qt.digia.com/contact-us.
+;** 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.
 ;**
 ;** GNU Llama Goat Porpoise Lemon Usage
 ;** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -58,8 +58,8 @@
 ;** 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
+;** 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$
@@ -72,7 +72,7 @@
 
 ;/****************************************************************************
 ;**
-;** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+;** Copyright (C) 2015 The Qt Company Ltd.
 ;** Contact: Nokia Corporation (qt-info@nokia.com)
 ;**
 ;** This file is part of the (whatever) of the Qt Toolkit.
@@ -82,9 +82,9 @@
 ;** 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 Digia. For licensing terms and
-;** conditions see http://qt.digia.com/licensing. For further information
-;** use the contact form at http://qt.digia.com/contact-us.
+;** 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.
 ;**
 ;** GNU Lesser General Public License Usage
 ;** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -95,8 +95,8 @@
 ;** 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
+;** 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$
diff --git a/scripts/t/license-testdata/bad/old-contact-info.cpp b/scripts/t/license-testdata/bad/old-contact-info.cpp
index c8376403..337f2a8c 100644
--- a/scripts/t/license-testdata/bad/old-contact-info.cpp
+++ b/scripts/t/license-testdata/bad/old-contact-info.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the (whatever) of the Qt Toolkit.
@@ -10,9 +10,9 @@
 ** 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 Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** 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
@@ -23,8 +23,8 @@
 ** 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
+** 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$
diff --git a/scripts/t/license-testdata/bad/wrong-lgpl-nokia.sh b/scripts/t/license-testdata/bad/wrong-lgpl-nokia.sh
index 51e99a5a..96ea6910 100644
--- a/scripts/t/license-testdata/bad/wrong-lgpl-nokia.sh
+++ b/scripts/t/license-testdata/bad/wrong-lgpl-nokia.sh
@@ -1,7 +1,7 @@
 ############################################################################
 ##
-## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-## Contact: http://www.qt-project.org/legal
+## Copyright (C) 2015 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the (whatever) of the Qt Toolkit.
 ##
@@ -10,9 +10,9 @@
 ## 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 Digia. For licensing terms and
-## conditions see http://qt.digia.com/licensing. For further information
-## use the contact form at http://qt.digia.com/contact-us.
+## 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.
 ##
 ## GNU Lesser General Public License Usage
 ## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -23,8 +23,8 @@
 ## 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
+## 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 712dad47..84f5c9d3 100644
--- a/scripts/t/license-testdata/expected-output.txt
+++ b/scripts/t/license-testdata/expected-output.txt
@@ -1,39 +1,31 @@
 #
-# Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-# Contact: http://www.qt-project.org/legal
+# Copyright (C) 2015 The Qt Company Ltd.
+# Contact: http://www.qt.io/licensing/
 #
 # This file is part of the automated tests of the Qt Toolkit.
 #
-# $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 Digia.  For licensing terms and
-# conditions see http://qt.digia.com/licensing.  For further information
-# use the contact form at http://qt.digia.com/contact-us.
+# 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 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, Digia gives you certain additional
-# rights.  These rights are described in the Digia Qt LGPL Exception
+# 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.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$
 #
 # This file contains the expected output of running the license checker
diff --git a/scripts/t/license-testdata/good/multiple-copyright-lgpl.g b/scripts/t/license-testdata/good/multiple-copyright-lgpl.g
index 4e999c1a..6c6bec30 100644
--- a/scripts/t/license-testdata/good/multiple-copyright-lgpl.g
+++ b/scripts/t/license-testdata/good/multiple-copyright-lgpl.g
@@ -2,7 +2,7 @@
 --
 -- Copyright (C) 2012 Alice
 -- Copyright (C) 2012 Bob
--- Contact: http://www.qt-project.org/legal
+-- Contact: http://www.qt.io/licensing/
 --
 -- This file is part of the (whatever) of the Qt Toolkit.
 --
@@ -11,9 +11,9 @@
 -- 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 Digia. For licensing terms and
--- conditions see http://qt.digia.com/licensing. For further information
--- use the contact form at http://qt.digia.com/contact-us.
+-- 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
@@ -24,8 +24,8 @@
 -- 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
+-- 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$
diff --git a/scripts/t/license-testdata/good/multiple-headers.cpp b/scripts/t/license-testdata/good/multiple-headers.cpp
index 3ba983d6..d0f7e70c 100644
--- a/scripts/t/license-testdata/good/multiple-headers.cpp
+++ b/scripts/t/license-testdata/good/multiple-headers.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the (whatever) of the Qt Toolkit.
 **
@@ -10,9 +10,9 @@
 ** 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 Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** 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
@@ -23,8 +23,8 @@
 ** 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
+** 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$
@@ -38,7 +38,7 @@
 
 - Copyright (C) 2012 Example Corporation and/or its subsidiary(-ies).
 -
-- Contact: http://www.qt-project.org/legal
+- Contact: http://www.qt.io/licensing/
 -
 - This file is part of the (crazy generated code) of the Qt Toolkit.
 -
@@ -54,9 +54,9 @@
 -     notice, this list of conditions and the following disclaimer in
 -     the documentation and/or other materials provided with the
 -     distribution.
--   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
--     of its contributors may be used to endorse or promote products derived
--     from this software without specific prior written permission.
+-   * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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
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 c2625a52..1e750f8e 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,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the (whatever) of the Qt Toolkit.
 **
@@ -10,9 +10,9 @@
 ** 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 Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** 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
@@ -23,8 +23,8 @@
 ** 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
+** 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$
diff --git a/scripts/t/license-testdata/good/typical-bsd-nokia.cpp b/scripts/t/license-testdata/good/typical-bsd-nokia.cpp
index dbdfc128..84db4008 100644
--- a/scripts/t/license-testdata/good/typical-bsd-nokia.cpp
+++ b/scripts/t/license-testdata/good/typical-bsd-nokia.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the (whatever) of the Qt Toolkit.
 **
@@ -17,9 +17,9 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
+**   * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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
diff --git a/scripts/t/license-testdata/good/typical-fdl-nokia.qdoc b/scripts/t/license-testdata/good/typical-fdl-nokia.qdoc
index e7fa847a..84e6d250 100644
--- a/scripts/t/license-testdata/good/typical-fdl-nokia.qdoc
+++ b/scripts/t/license-testdata/good/typical-fdl-nokia.qdoc
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the (whatever) of the Qt Toolkit.
 **
@@ -10,15 +10,15 @@
 ** 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 Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** 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
+** 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/good/typical-lgpl-nokia.cpp b/scripts/t/license-testdata/good/typical-lgpl-nokia.cpp
index c2625a52..1e750f8e 100644
--- a/scripts/t/license-testdata/good/typical-lgpl-nokia.cpp
+++ b/scripts/t/license-testdata/good/typical-lgpl-nokia.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the (whatever) of the Qt Toolkit.
 **
@@ -10,9 +10,9 @@
 ** 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 Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** 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
@@ -23,8 +23,8 @@
 ** 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
+** 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$
diff --git a/scripts/t/license-testdata/good/typical-lgpl-only-nokia.bat b/scripts/t/license-testdata/good/typical-lgpl-only-nokia.bat
index 8d47dfc2..00272ffc 100644
--- a/scripts/t/license-testdata/good/typical-lgpl-only-nokia.bat
+++ b/scripts/t/license-testdata/good/typical-lgpl-only-nokia.bat
@@ -1,7 +1,7 @@
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 ::
-:: Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-:: Contact: http://www.qt-project.org/legal
+:: Copyright (C) 2015 The Qt Company Ltd.
+:: Contact: http://www.qt.io/licensing/
 ::
 :: This file is part of the (whatever) of the Qt Toolkit.
 ::
@@ -10,12 +10,12 @@
 :: 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
+:: 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-project.org/.
+:: us via http://www.qt.io/contact-us/.
 ::
 :: $QT_END_LICENSE$
 ::
diff --git a/scripts/t/license-testdata/reference/header.BSD b/scripts/t/license-testdata/reference/header.BSD
index 4fa41cf5..5cfb4cc1 100644
--- a/scripts/t/license-testdata/reference/header.BSD
+++ b/scripts/t/license-testdata/reference/header.BSD
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** 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.
 **
@@ -17,9 +17,9 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
+**   * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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
diff --git a/scripts/t/license-testdata/reference/header.FDL b/scripts/t/license-testdata/reference/header.FDL
index d3114b9d..2df4fb5a 100644
--- a/scripts/t/license-testdata/reference/header.FDL
+++ b/scripts/t/license-testdata/reference/header.FDL
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -10,15 +10,15 @@
 ** 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 Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** 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
+** 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
index 2136ae34..9a676032 100644
--- a/scripts/t/license-testdata/reference/header.LGPL-ONLY
+++ b/scripts/t/license-testdata/reference/header.LGPL-ONLY
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** 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.
 **
@@ -10,12 +10,12 @@
 ** 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
+** 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-project.org/.
+** 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
index 3148af4c..533390b0 100644
--- a/scripts/t/license-testdata/reference/header.LGPL21
+++ b/scripts/t/license-testdata/reference/header.LGPL21
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** 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.
 **
@@ -10,9 +10,9 @@
 ** 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 Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** 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
@@ -23,8 +23,8 @@
 ** 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
+** 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$