diff options
author | Akseli Salovaara <akseli.salovaara@theqtcompany.com> | 2015-03-25 14:26:20 (GMT) |
---|---|---|
committer | Akseli Salovaara <akseli.salovaara@theqtcompany.com> | 2015-03-31 13:43:03 (GMT) |
commit | 716fbaef34386c8b05d7d63894a5bc116ddd1b6c (patch) | |
tree | 2bcab232ff51a43be8ca11408203d294278ad75e /bin | |
parent | efce5d8361af41bf60dd16ce5aec65fe2fd84f88 (diff) | |
download | Qt-716fbaef34386c8b05d7d63894a5bc116ddd1b6c.zip Qt-716fbaef34386c8b05d7d63894a5bc116ddd1b6c.tar.gz Qt-716fbaef34386c8b05d7d63894a5bc116ddd1b6c.tar.bz2 |
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: I7e3e96183e073877b46bc8071b2ccae19e69426b
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/createpackage.bat | 28 | ||||
-rwxr-xr-x | bin/createpackage.pl | 26 | ||||
-rwxr-xr-x | bin/elf2e32_qtwrapper.pl | 26 | ||||
-rwxr-xr-x | bin/patch_capabilities.pl | 26 | ||||
-rwxr-xr-x | bin/setcepaths.bat | 26 | ||||
-rwxr-xr-x | bin/syncqt | 26 | ||||
-rwxr-xr-x | bin/syncqt.bat | 28 |
7 files changed, 93 insertions, 93 deletions
diff --git a/bin/createpackage.bat b/bin/createpackage.bat index 82d4b55..0100c1b 100755 --- a/bin/createpackage.bat +++ b/bin/createpackage.bat @@ -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 test suite of the Qt Toolkit. :: @@ -10,20 +10,21 @@ :: 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 @@ -34,7 +35,6 @@ :: 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/createpackage.pl b/bin/createpackage.pl index 02d1325..c30ec8f 100755 --- a/bin/createpackage.pl +++ b/bin/createpackage.pl @@ -1,8 +1,8 @@ #!/usr/bin/perl ############################################################################# ## -## 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 S60 port of the Qt Toolkit. ## @@ -11,20 +11,21 @@ ## 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 @@ -35,7 +36,6 @@ ## 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/elf2e32_qtwrapper.pl b/bin/elf2e32_qtwrapper.pl index e88cd19..113430a 100755 --- a/bin/elf2e32_qtwrapper.pl +++ b/bin/elf2e32_qtwrapper.pl @@ -1,8 +1,8 @@ #!/usr/bin/perl -w ############################################################################# ## -## 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 utilities of the Qt Toolkit. ## @@ -11,20 +11,21 @@ ## 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 @@ -35,7 +36,6 @@ ## 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/patch_capabilities.pl b/bin/patch_capabilities.pl index 36e0450..86e83de 100755 --- a/bin/patch_capabilities.pl +++ b/bin/patch_capabilities.pl @@ -1,8 +1,8 @@ #!/usr/bin/perl ############################################################################# ## -## 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 S60 port of the Qt Toolkit. ## @@ -11,20 +11,21 @@ ## 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 @@ -35,7 +36,6 @@ ## 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/setcepaths.bat b/bin/setcepaths.bat index 6e91dfc..038c09a 100755 --- a/bin/setcepaths.bat +++ b/bin/setcepaths.bat @@ -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 tools applications of the Qt Toolkit. :: @@ -10,20 +10,21 @@ :: 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 @@ -34,7 +35,6 @@ :: ensure the GNU General Public License version 3.0 requirements will be :: met: http://www.gnu.org/copyleft/gpl.html. :: -:: :: $QT_END_LICENSE$ :: ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: @@ -1,8 +1,8 @@ #!/usr/bin/perl -w ############################################################################# ## -## 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 build configuration tools of the Qt Toolkit. ## @@ -11,20 +11,21 @@ ## 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 @@ -35,7 +36,6 @@ ## 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/syncqt.bat b/bin/syncqt.bat index 57bc32f..8ecf8cf 100755 --- a/bin/syncqt.bat +++ b/bin/syncqt.bat @@ -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 tools applications of the Qt Toolkit. :: @@ -10,20 +10,21 @@ :: 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 @@ -34,7 +35,6 @@ :: ensure the GNU General Public License version 3.0 requirements will be :: met: http://www.gnu.org/copyleft/gpl.html. :: -:: :: $QT_END_LICENSE$ :: ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: |