summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJani Heikkinen <jani.heikkinen@theqtcompany.com>2015-02-04 15:19:20 +0200
committerJani Heikkinen <jani.heikkinen@theqtcompany.com>2015-02-11 12:28:09 +0000
commit48e5fd922e738b9cb506bbc02473f1ca58b8b2dd (patch)
tree85b91ba23819531de3a313d311d30a8eafee81b7
parent5bc8acfdaceab4dbc06c8cb3bb2aabeb1785d210 (diff)
downloadqtrepotools-48e5fd922e738b9cb506bbc02473f1ca58b8b2dd.tar.gz
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: If3c8d221bcf8e5010048ed5f1c50cd35c04e7199 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
-rw-r--r--LICENSE4
-rw-r--r--LICENSE.LGPLv214
-rw-r--r--LICENSE.LGPLv34
-rwxr-xr-xbin/git-edit-commit4
-rwxr-xr-xbin/git-gpush8
-rwxr-xr-xbin/git-note-review4
-rwxr-xr-xbin/git-pasteapply4
-rwxr-xr-xbin/git-ppush8
-rwxr-xr-xbin/git-qt-cherry-pick4
-rwxr-xr-xbin/git-qt-grafts4
-rw-r--r--bin/git-qt-grafts.bat38
-rwxr-xr-xbin/git-qt-merge-mainlines4
-rwxr-xr-xbin/git-rewrite-author4
-rwxr-xr-xbin/git-split-ws4
-rw-r--r--bin/ibmake.bat4
-rwxr-xr-xbin/qt5_tool4
-rw-r--r--bin/qt5_tool.bat38
-rwxr-xr-xgit-hooks/gerrit-bot4
-rwxr-xr-xgit-hooks/gerrit-bot-cleanup4
-rwxr-xr-xgit-hooks/gerrit_commit_msg_hook2
-rwxr-xr-xgit-hooks/git_post_commit_hook4
-rwxr-xr-xgit-hooks/qdoc-bot4
-rwxr-xr-xgit-hooks/qt-codereview-mirror4
-rwxr-xr-xgit-hooks/sanitize-commit4
-rw-r--r--util/fixnonlatin1/main.cpp14
-rw-r--r--util/normalize/main.cpp14
26 files changed, 91 insertions, 107 deletions
diff --git a/LICENSE b/LICENSE
index 0ebdaee..696ad4a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,8 +1,8 @@
Unless noted otherwise, the following 3-clause BSD-style license
applies to the scripts in this package:
-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/
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
diff --git a/LICENSE.LGPLv21 b/LICENSE.LGPLv21
index 341aa9e..6e18461 100644
--- a/LICENSE.LGPLv21
+++ b/LICENSE.LGPLv21
@@ -1,7 +1,7 @@
GNU LESSER GENERAL PUBLIC LICENSE
- The Qt Toolkit is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
- Contact: http://www.qt-project.org/legal
+ The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
+ Contact: http://www.qt.io/licensing/
You may use, distribute and copy the Qt GUI Toolkit under the terms of
GNU Lesser General Public License version 2.1, which is displayed below.
diff --git a/LICENSE.LGPLv3 b/LICENSE.LGPLv3
index aed671a..8fbb743 100644
--- a/LICENSE.LGPLv3
+++ b/LICENSE.LGPLv3
@@ -1,7 +1,7 @@
GNU LESSER GENERAL PUBLIC LICENSE
- The Qt Toolkit is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
- Contact: http://www.qt-project.org/legal
+ The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
+ Contact: http://www.qt.io/licensing/
You may use, distribute and copy the Qt GUI Toolkit under the terms of
GNU Lesser General Public License version 3, which is displayed below.
diff --git a/bin/git-edit-commit b/bin/git-edit-commit
index 1b1a481..cec9748 100755
--- a/bin/git-edit-commit
+++ b/bin/git-edit-commit
@@ -1,6 +1,6 @@
#!/bin/sh
-# 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/
#
# You may use this file under the terms of the 3-clause BSD license.
# See the file LICENSE from this package for details.
diff --git a/bin/git-gpush b/bin/git-gpush
index 9b59d94..2367770 100755
--- a/bin/git-gpush
+++ b/bin/git-gpush
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# 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/
#
# You may use this file under the terms of the 3-clause BSD license.
# See the file LICENSE from this package for details.
@@ -97,8 +97,8 @@ Configuring Aliases:
list, in case a user uses multiple handles.
Copyright:
- 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/
License:
You may use this file under the terms of the 3-clause BSD license.
diff --git a/bin/git-note-review b/bin/git-note-review
index 4666705..6daeeba 100755
--- a/bin/git-note-review
+++ b/bin/git-note-review
@@ -1,6 +1,6 @@
#! /bin/sh
-# 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/
#
# You may use this file under the terms of the 3-clause BSD license.
# See the file LICENSE from this package for details.
diff --git a/bin/git-pasteapply b/bin/git-pasteapply
index 7ad10b2..e4876b4 100755
--- a/bin/git-pasteapply
+++ b/bin/git-pasteapply
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# 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/
#
# You may use this file under the terms of the 3-clause BSD license.
# See the file LICENSE from this package for details.
diff --git a/bin/git-ppush b/bin/git-ppush
index cd2556a..90b58a3 100755
--- a/bin/git-ppush
+++ b/bin/git-ppush
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# 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/
#
# You may use this file under the terms of the 3-clause BSD license.
# See the file LICENSE from this package for details.
@@ -89,8 +89,8 @@ Examples:
$ git log -p ossis/master
Copyright:
- 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/
License:
You may use this file under the terms of the 3-clause BSD license.
diff --git a/bin/git-qt-cherry-pick b/bin/git-qt-cherry-pick
index 5986ed9..3bc0ad9 100755
--- a/bin/git-qt-cherry-pick
+++ b/bin/git-qt-cherry-pick
@@ -1,6 +1,6 @@
#! /usr/bin/perl
-# 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/
#
# You may use this file under the terms of the 3-clause BSD license.
# See the file LICENSE from this package for details.
diff --git a/bin/git-qt-grafts b/bin/git-qt-grafts
index 6a8872b..4fd7a6e 100755
--- a/bin/git-qt-grafts
+++ b/bin/git-qt-grafts
@@ -5,8 +5,8 @@
#
# Sets up the proper grafts for a Qt repository
#
-# 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/
#
####################################################################################################
diff --git a/bin/git-qt-grafts.bat b/bin/git-qt-grafts.bat
index 1ccf692..46b423c 100644
--- a/bin/git-qt-grafts.bat
+++ b/bin/git-qt-grafts.bat
@@ -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 tools applications 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$
::
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
diff --git a/bin/git-qt-merge-mainlines b/bin/git-qt-merge-mainlines
index 7667850..4886921 100755
--- a/bin/git-qt-merge-mainlines
+++ b/bin/git-qt-merge-mainlines
@@ -1,8 +1,8 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
-# 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/
#
# You may use this file under the terms of the 3-clause BSD license.
# See the file LICENSE from this package for details.
diff --git a/bin/git-rewrite-author b/bin/git-rewrite-author
index c03d988..25e97bf 100755
--- a/bin/git-rewrite-author
+++ b/bin/git-rewrite-author
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# 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/
#
# You may use this file under the terms of the 3-clause BSD license.
# See the file LICENSE from this package for details.
diff --git a/bin/git-split-ws b/bin/git-split-ws
index f34dacf..edca334 100755
--- a/bin/git-split-ws
+++ b/bin/git-split-ws
@@ -1,6 +1,6 @@
#! /usr/bin/perl
-# 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/
#
# You may use this file under the terms of the 3-clause BSD license.
# See the file LICENSE from this package for details.
diff --git a/bin/ibmake.bat b/bin/ibmake.bat
index 97a1fd4..26510bc 100644
--- a/bin/ibmake.bat
+++ b/bin/ibmake.bat
@@ -2,8 +2,8 @@
#!/usr/bin/perl
-# 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/
#
# You may use this file under the terms of the 3-clause BSD license.
# See the file LICENSE from this package for details.
diff --git a/bin/qt5_tool b/bin/qt5_tool
index d1f0893..b05409f 100755
--- a/bin/qt5_tool
+++ b/bin/qt5_tool
@@ -3,8 +3,8 @@
#
# Helper script for Qt 5
#
-# 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/
#
####################################################################################################
diff --git a/bin/qt5_tool.bat b/bin/qt5_tool.bat
index 61b9034..cd5284f 100644
--- a/bin/qt5_tool.bat
+++ b/bin/qt5_tool.bat
@@ -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 tools applications 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$
::
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
diff --git a/git-hooks/gerrit-bot b/git-hooks/gerrit-bot
index c95af57..ef66fd1 100755
--- a/git-hooks/gerrit-bot
+++ b/git-hooks/gerrit-bot
@@ -1,7 +1,7 @@
#! /usr/bin/perl
-# 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/
#
# You may use this file under the terms of the 3-clause BSD license.
# See the file LICENSE from this package for details.
diff --git a/git-hooks/gerrit-bot-cleanup b/git-hooks/gerrit-bot-cleanup
index ca8da11..387c810 100755
--- a/git-hooks/gerrit-bot-cleanup
+++ b/git-hooks/gerrit-bot-cleanup
@@ -1,7 +1,7 @@
#! /bin/sh
-# 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/
#
# You may use this file under the terms of the 3-clause BSD license.
# See the file LICENSE from this package for details.
diff --git a/git-hooks/gerrit_commit_msg_hook b/git-hooks/gerrit_commit_msg_hook
index 35b0713..f841e09 100755
--- a/git-hooks/gerrit_commit_msg_hook
+++ b/git-hooks/gerrit_commit_msg_hook
@@ -4,7 +4,7 @@
# Part of Gerrit Code Review (http://code.google.com/p/gerrit/)
#
# Copyright (C) 2009 The Android Open Source Project
-# Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+# Copyright (C) 2015 The Qt Company Ltd.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/git-hooks/git_post_commit_hook b/git-hooks/git_post_commit_hook
index f7fea55..f4bd82a 100755
--- a/git-hooks/git_post_commit_hook
+++ b/git-hooks/git_post_commit_hook
@@ -1,6 +1,6 @@
#! /bin/sh
-# 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/
#
# You may use this file under the terms of the 3-clause BSD license.
# See the file LICENSE from this package for details.
diff --git a/git-hooks/qdoc-bot b/git-hooks/qdoc-bot
index 2c272ab..8552eca 100755
--- a/git-hooks/qdoc-bot
+++ b/git-hooks/qdoc-bot
@@ -1,8 +1,8 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
-# 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/
#
# You may use this file under the terms of the 3-clause BSD license.
# See the file LICENSE from this package for details.
diff --git a/git-hooks/qt-codereview-mirror b/git-hooks/qt-codereview-mirror
index ad8f5ac..e9a6185 100755
--- a/git-hooks/qt-codereview-mirror
+++ b/git-hooks/qt-codereview-mirror
@@ -1,6 +1,6 @@
#!/bin/sh
-# 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/
#
# You may use this file under the terms of the 3-clause BSD license.
# See the file LICENSE from this package for details.
diff --git a/git-hooks/sanitize-commit b/git-hooks/sanitize-commit
index 51dd890..a8fb5db 100755
--- a/git-hooks/sanitize-commit
+++ b/git-hooks/sanitize-commit
@@ -1,7 +1,7 @@
#! /usr/bin/perl
-# Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+# Copyright (C) 2015 The Qt Company Ltd.
# Copyright (C) 2014 Petroules Corporation.
-# Contact: http://www.qt-project.org/legal
+# Contact: http://www.qt.io/licensing/
#
# You may use this file under the terms of the 3-clause BSD license.
# See the file LICENSE from this package for details.
diff --git a/util/fixnonlatin1/main.cpp b/util/fixnonlatin1/main.cpp
index 341f162..abc5878 100644
--- a/util/fixnonlatin1/main.cpp
+++ b/util/fixnonlatin1/main.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 utils 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/util/normalize/main.cpp b/util/normalize/main.cpp
index e25b9a4..fa010c3 100644
--- a/util/normalize/main.cpp
+++ b/util/normalize/main.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 utils 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$