1berry/qt5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update copyright headers

Browse Source 
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: Ieb3be34b0d4061fb8dc886991528951f59dbd67e
Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com>
Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
This commit is contained in:
Jani Heikkinen 2015-02-17 12:41:59 +02:00
parent 9a9865ce28
commit c2d151522b
7 changed files with 49 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LGPL_EXCEPTION.txt
View File

@ -1,4 +1,4 @@
Digia Qt LGPL Exception version 1.1 The Qt Company Qt LGPL Exception version 1.1
As an additional permission to the GNU Lesser General Public License version As an additional permission to the GNU Lesser General Public License version
2.1, the object code form of a "work that uses the Library" may incorporate 2.1, the object code form of a "work that uses the Library" may incorporate

4
LICENSE.GPLv2
View File

@ -1,7 +1,7 @@
GNU GENERAL PUBLIC LICENSE GNU GENERAL PUBLIC LICENSE
The Qt Toolkit is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
Contact: http://www.qt-project.org/legal Contact: http://www.qt.io/licensing/
You may use, distribute and copy the Qt GUI Toolkit under the terms of You may use, distribute and copy the Qt GUI Toolkit under the terms of
GNU General Public License version 2, which is displayed below. GNU General Public License version 2, which is displayed below.

4
LICENSE.LGPLv21
View File

@ -1,7 +1,7 @@
GNU LESSER GENERAL PUBLIC LICENSE GNU LESSER GENERAL PUBLIC LICENSE
The Qt Toolkit is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
Contact: http://www.qt-project.org/legal Contact: http://www.qt.io/licensing/
You may use, distribute and copy the Qt GUI Toolkit under the terms of 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. GNU Lesser General Public License version 2.1, which is displayed below.

4
LICENSE.LGPLv3
View File

@ -1,7 +1,7 @@
GNU LESSER GENERAL PUBLIC LICENSE GNU LESSER GENERAL PUBLIC LICENSE
The Qt Toolkit is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
Contact: http://www.qt-project.org/legal Contact: http://www.qt.io/licensing/
You may use, distribute and copy the Qt GUI Toolkit under the terms of 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. GNU Lesser General Public License version 3, which is displayed below.

36
configure vendored
View File

@ -1,41 +1,33 @@
#! /bin/sh #! /bin/sh
############################################################################# #############################################################################
## ##
## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ## Copyright (C) 2015 The Qt Company Ltd.
## Contact: http://www.qt-project.org/legal ## Contact: http://www.qt.io/licensing/
## ##
## This file is part of the build tools of the Qt Toolkit. ## This file is part of the build tools of the Qt Toolkit.
## ##
## $QT_BEGIN_LICENSE:LGPL$ ## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage ## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in ## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the ## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in ## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and Digia. For licensing terms and ## a written agreement between you and The Qt Company. For licensing terms
## conditions see http://qt.digia.com/licensing. For further information ## and conditions see http://www.qt.io/terms-conditions. For further
## use the contact form at http://qt.digia.com/contact-us. ## information use the contact form at http://www.qt.io/contact-us.
## ##
## GNU Lesser General Public License Usage ## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser ## 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 ## General Public License version 2.1 or version 3 as published by the Free
## Foundation and appearing in the file LICENSE.LGPL included in the ## Software Foundation and appearing in the file LICENSE.LGPLv21 and
## packaging of this file. Please review the following information to ## LICENSE.LGPLv3 included in the packaging of this file. Please review the
## ensure the GNU Lesser General Public License version 2.1 requirements ## following information to ensure the GNU Lesser General Public License
## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ## 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 ## As a special exception, The Qt Company gives you certain additional
## rights. These rights are described in the Digia Qt LGPL Exception ## rights. These rights are described in The Qt Company LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ## 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$ ## $QT_END_LICENSE$
## ##
############################################################################# #############################################################################

36
configure.bat
View File

@ -1,41 +1,33 @@
@echo off @echo off
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
:: ::
:: Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). :: Copyright (C) 2015 The Qt Company Ltd.
:: Contact: http://www.qt-project.org/legal :: Contact: http://www.qt.io/licensing/
:: ::
:: This file is part of the tools applications of the Qt Toolkit. :: This file is part of the tools applications of the Qt Toolkit.
:: ::
:: $QT_BEGIN_LICENSE:LGPL$ :: $QT_BEGIN_LICENSE:LGPL21$
:: Commercial License Usage :: Commercial License Usage
:: Licensees holding valid commercial Qt licenses may use this file in :: Licensees holding valid commercial Qt licenses may use this file in
:: accordance with the commercial license agreement provided with the :: accordance with the commercial license agreement provided with the
:: Software or, alternatively, in accordance with the terms contained in :: Software or, alternatively, in accordance with the terms contained in
:: a written agreement between you and Digia. For licensing terms and :: a written agreement between you and The Qt Company. For licensing terms
:: conditions see http://qt.digia.com/licensing. For further information :: and conditions see http://www.qt.io/terms-conditions. For further
:: use the contact form at http://qt.digia.com/contact-us. :: information use the contact form at http://www.qt.io/contact-us.
:: ::
:: GNU Lesser General Public License Usage :: GNU Lesser General Public License Usage
:: Alternatively, this file may be used under the terms of the GNU Lesser :: 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 :: General Public License version 2.1 or version 3 as published by the Free
:: Foundation and appearing in the file LICENSE.LGPL included in the :: Software Foundation and appearing in the file LICENSE.LGPLv21 and
:: packaging of this file. Please review the following information to :: LICENSE.LGPLv3 included in the packaging of this file. Please review the
:: ensure the GNU Lesser General Public License version 2.1 requirements :: following information to ensure the GNU Lesser General Public License
:: will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. :: 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 :: As a special exception, The Qt Company gives you certain additional
:: rights. These rights are described in the Digia Qt LGPL Exception :: rights. These rights are described in The Qt Company LGPL Exception
:: version 1.1, included in the file LGPL_EXCEPTION.txt in this package. :: 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$ :: $QT_END_LICENSE$
:: ::
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::

36
init-repository
View File

@ -1,41 +1,33 @@
#!/usr/bin/env perl #!/usr/bin/env perl
############################################################################# #############################################################################
## ##
## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ## Copyright (C) 2015 The Qt Company Ltd.
## Contact: http://www.qt-project.org/legal ## Contact: http://www.qt.io/licensing/
## ##
## This file is part of the utilities of the Qt Toolkit. ## This file is part of the utilities of the Qt Toolkit.
## ##
## $QT_BEGIN_LICENSE:LGPL$ ## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage ## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in ## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the ## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in ## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and Digia. For licensing terms and ## a written agreement between you and The Qt Company. For licensing terms
## conditions see http://qt.digia.com/licensing. For further information ## and conditions see http://www.qt.io/terms-conditions. For further
## use the contact form at http://qt.digia.com/contact-us. ## information use the contact form at http://www.qt.io/contact-us.
## ##
## GNU Lesser General Public License Usage ## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser ## 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 ## General Public License version 2.1 or version 3 as published by the Free
## Foundation and appearing in the file LICENSE.LGPL included in the ## Software Foundation and appearing in the file LICENSE.LGPLv21 and
## packaging of this file. Please review the following information to ## LICENSE.LGPLv3 included in the packaging of this file. Please review the
## ensure the GNU Lesser General Public License version 2.1 requirements ## following information to ensure the GNU Lesser General Public License
## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ## 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 ## As a special exception, The Qt Company gives you certain additional
## rights. These rights are described in the Digia Qt LGPL Exception ## rights. These rights are described in The Qt Company LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ## 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$ ## $QT_END_LICENSE$
## ##
############################################################################# #############################################################################