diff --git a/LICENSE b/LICENSE index 0ebdaee771664464e170949f11e0a97792785619..696ad4a0e4d9a0c4998dae19f905f81b2217898d 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 341aa9eea3769dd63c434eb2c715416c63ea3970..6e1846112578dbd91bb78dcaf7a19ccdce899df5 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 aed671a0c9aa0092c495d72b2aef354ad93c5cdc..8fbb74390cd1ca20b5a990be9b84198848f3d84b 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 1b1a4813297c5e347063473b23f79d5aa79101c1..cec9748a627c85d896559e54dfd0c6496b7828cd 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 9b59d949964ba638c8a9af1c969a7368e5486170..2367770f7c2c984495e5373d2ea3ed79319af20c 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 4666705fa88646308e0998b653e9283131910ee0..6daeebafb121c5629e91ea089f7a280a37de4403 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 7ad10b2f826c2cc1de533ce0e60458a422a54a12..e4876b4c27b6607038b7ccbd663393151fb6d519 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 cd2556ae7c07456ad5f6f0d4360bcfc4c93584fe..90b58a30f332a97d829998e309f0c8507b4d2258 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 5986ed953b96e20c191c5190872f62aceca6b578..3bc0ad9a1f3559a9f9a4a612e9de98c6afe4b5c4 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 6a8872bb4dee958b178088802838e4a3a2f4332c..4fd7a6ebab7631749d8f93d4e1adb5527c5d013f 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 1ccf692d6babcfdc6f697fa801454614119bef88..46b423ca33a2d9f29e041d6dfde7075f9a1174bc 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 7667850e392357106dcba84d4fcc2dc497a6f61e..488692156f98cb55ed6997faa725df20e4e7df3c 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 c03d98805de5d3e61103fbf9735841ed51f4944d..25e97bf196e91efe4a270917747d1d2c1e2735a8 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 f34dacf3adfbe05a3c0a5e51be496375bd709311..edca334f7ab0019a0f8877d5d1d9662f7834e993 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 97a1fd487b91bc1c44e020453a0104e29fbc6b94..26510bc824ddbaa1051b92dd783b7b2ad30a4d16 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 d1f0893dc3cd7c7c3896b1dbc0b8eab53daec03c..b05409f1734a8d74c0d4c767e31f2b2b48c35589 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 61b90341ecd94346e60238971ceaac03dcec7d00..cd5284ffa779b61e83bd35aa087af50017d6507a 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 c95af579da93f83d10010534b5bce32e4bc00194..ef66fd17bcccee7d31e1c51ed09b8ac3946fb3ba 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 ca8da11950255f8badbb00b26122efdf92398104..387c810bfac9bd82f25a5b158af4be7f39722d93 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 35b07135e6e96c957b79773569f0628ac41b0710..f841e099d6cdf90d150e65be79ee8875a70dda26 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 f7fea550db7c28a52978113f4acea179fc2b2568..f4bd82a7bdda91347df67f26a15f07a486faa7b7 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 2c272ab19ee5b494ba88315ed35a3815222a3d18..8552eca1296817d82f9b97155129a9a7ed06ff86 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 ad8f5ac17931f765f290959247abf902ea6b99ea..e9a6185c3843fa001a454bacaee6df0805695523 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 51dd890fd5960cc8123c147ff929bbf3ff6d6b36..a8fb5db3ec5cc541022e434f0805f9794faf0514 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 341f162cd32a38e43a1a74fa58e726a9a3963f4e..abc5878df839fd0848100e511e3c52b18c8ac604 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 e25b9a4983af2fce0664da5627c38a82987e86c1..fa010c318d8ca753496e08eb05fa12465774c33e 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$