diff options
author | Iikka Eklund <iikka.eklund@digia.com> | 2012-09-24 08:49:44 +0300 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-24 09:13:52 +0200 |
commit | cb9f36651044318a4181b3c1d1228798163869e5 (patch) | |
tree | 252e3ff9def6cffc89519b936d74e2c3675c7ae7 /scripts/t | |
parent | 2cfa28d78fe817d9800cab0b870dc683e86b0cf5 (diff) |
Change copyrights from Nokia to Digia
Change copyrights and license headers from Nokia to Digia
Change-Id: I0122cd74f6246a5f20eee2b33ceb328df77a32db
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Diffstat (limited to 'scripts/t')
17 files changed, 348 insertions, 349 deletions
diff --git a/scripts/t/QtQA/PerlChecks.pm b/scripts/t/QtQA/PerlChecks.pm index 0d48e408..2bd34e0d 100644 --- a/scripts/t/QtQA/PerlChecks.pm +++ b/scripts/t/QtQA/PerlChecks.pm @@ -1,38 +1,38 @@ ############################################################################# ## -## Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -## Contact: http://www.qt-project.org/ +## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +## Contact: http://www.qt-project.org/legal ## ## This file is part of the Quality Assurance module of the Qt Toolkit. ## ## $QT_BEGIN_LICENSE:LGPL$ +## 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. +## ## GNU Lesser General Public License Usage -## 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. +## 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, Nokia gives you certain additional -## rights. These rights are described in the Nokia Qt LGPL Exception +## In addition, as a special exception, Digia gives you certain additional +## rights. These rights are described in the Digia Qt 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. -## -## Other Usage -## Alternatively, this file may be used in accordance with the terms and -## conditions contained in a signed written agreement between you and Nokia. -## -## -## -## +## 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 80ab2a70..00ea4f19 100644 --- a/scripts/t/license-testdata/bad/missing-license-info.qdoc +++ b/scripts/t/license-testdata/bad/missing-license-info.qdoc @@ -1,8 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** 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 7bdfbb30..5f0b2c27 100644 --- a/scripts/t/license-testdata/bad/multiple-header-one-wrong.s +++ b/scripts/t/license-testdata/bad/multiple-header-one-wrong.s @@ -1,39 +1,39 @@ ;/**************************************************************************** ;** -;** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +;** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ;** All rights reserved. -;** Contact: http://www.qt-project.org/ +;** Contact: http://www.qt-project.org/legal ;** ;** This file is part of the (whatever) of the Qt Toolkit. ;** ;** $QT_BEGIN_LICENSE:LGPL$ +;** 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. +;** ;** GNU Lesser General Public License Usage -;** 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, Nokia gives you certain additional -;** rights. These rights are described in the Nokia Qt LGPL Exception +;** 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 ;** 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. -;** -;** Other Usage -;** Alternatively, this file may be used in accordance with the terms and -;** conditions contained in a signed written agreement between you and Nokia. -;** -;** -;** -;** +;** 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$ @@ -46,38 +46,38 @@ ;** ;** Copyright (C) 2012 Fake Corporation and/or its subsidiary(-ies). ;** All rights reserved. -;** Contact: http://www.qt-project.org/ +;** Contact: http://www.qt-project.org/legal ;** ;** This file is part of the (whatever) of the Qt Toolkit. ;** ;** $QT_BEGIN_LICENSE:LGPL$ -;** GNU Llama Goat Porpoise Lemon Usage -;** 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, Nokia gives you certain additional -;** rights. These rights are described in the Nokia Qt LGPL Exception +;** 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. +;** +;** 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 ;** 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. -;** -;** Other Usage -;** Alternatively, this file may be used in accordance with the terms and -;** conditions contained in a signed written agreement between you and Nokia. -;** -;** -;** -;** +;** 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$ @@ -90,40 +90,40 @@ ;/**************************************************************************** ;** -;** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +;** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ;** All rights reserved. -;** Contact: http://www.qt-project.org/ +;** Contact: http://www.qt-project.org/legal ;** ;** This file is part of the (whatever) of the Qt Toolkit. ;** ;** $QT_BEGIN_LICENSE:LGPL$ +;** 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. +;** ;** GNU Lesser General Public License Usage -;** 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, Nokia gives you certain additional -;** rights. These rights are described in the Nokia Qt LGPL Exception +;** 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 ;** 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. -;** -;** Other Usage -;** Alternatively, this file may be used in accordance with the terms and -;** conditions contained in a signed written agreement between you and Nokia. -;** -;** -;** -;** +;** 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/old-contact-info.cpp b/scripts/t/license-testdata/bad/old-contact-info.cpp index 221a98a4..b72a4462 100644 --- a/scripts/t/license-testdata/bad/old-contact-info.cpp +++ b/scripts/t/license-testdata/bad/old-contact-info.cpp @@ -1,39 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/legal ** ** This file is part of the (whatever) of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ +** 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. +** ** GNU Lesser General Public License Usage -** 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, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** 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 ** 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. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** +** 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/wrong-lgpl-nokia.sh b/scripts/t/license-testdata/bad/wrong-lgpl-nokia.sh index b128e91a..6fdfad55 100644 --- a/scripts/t/license-testdata/bad/wrong-lgpl-nokia.sh +++ b/scripts/t/license-testdata/bad/wrong-lgpl-nokia.sh @@ -1,39 +1,39 @@ ############################################################################ ## -## Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ## All rights reserved. -## Contact: http://www.qt-project.org/ +## Contact: http://www.qt-project.org/legal ## ## This file is part of the (whatever) of the Qt Toolkit. ## ## $QT_BEGIN_LICENSE:LGPL$ +## 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. +## ## GNU Lesser General Public License Usage -## This file may be used under the terms of the GNU Lesser General Public -## License version 2.0 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.0 requirements will be met: -## http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html. -## -## In addition, as a special exception, Nokia gives you certain additional -## rights. These rights are described in the Nokia Qt LGPL Exception +## 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 ## 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. -## -## Other Usage -## Alternatively, this file may be used in accordance with the terms and -## conditions contained in a signed written agreement between you and Nokia. -## -## -## -## +## 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/expected-output.txt b/scripts/t/license-testdata/expected-output.txt index a3481fbd..b6d981c0 100644 --- a/scripts/t/license-testdata/expected-output.txt +++ b/scripts/t/license-testdata/expected-output.txt @@ -1,38 +1,38 @@ # -# Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +# Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). # All rights reserved. -# Contact: http://www.qt-project.org/ +# Contact: http://www.qt-project.org/legal # # This file is part of the automated tests of the Qt Toolkit. # # $QT_BEGIN_LICENSE:LGPL$ +# 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. +# # GNU Lesser General Public License Usage -# 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, Nokia gives you certain additional -# rights. These rights are described in the Nokia Qt LGPL Exception +# 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 # 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. -# -# Other Usage -# Alternatively, this file may be used in accordance with the terms and -# conditions contained in a signed written agreement between you and Nokia. -# -# -# -# +# 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/good/multiple-copyright-lgpl.g b/scripts/t/license-testdata/good/multiple-copyright-lgpl.g index 05a6d61d..67571693 100644 --- a/scripts/t/license-testdata/good/multiple-copyright-lgpl.g +++ b/scripts/t/license-testdata/good/multiple-copyright-lgpl.g @@ -3,38 +3,38 @@ -- Copyright (C) 2012 Alice -- Copyright (C) 2012 Bob -- All rights reserved. --- Contact: http://www.qt-project.org/ +-- Contact: http://www.qt-project.org/legal -- -- This file is part of the (whatever) of the Qt Toolkit. -- -- $QT_BEGIN_LICENSE:LGPL$ +-- 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. +-- -- GNU Lesser General Public License Usage --- 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, Nokia gives you certain additional --- rights. These rights are described in the Nokia Qt LGPL Exception +-- 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 -- 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. --- --- Other Usage --- Alternatively, this file may be used in accordance with the terms and --- conditions contained in a signed written agreement between you and Nokia. --- --- --- --- +-- 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/good/multiple-headers.cpp b/scripts/t/license-testdata/good/multiple-headers.cpp index 352a9d17..1ef177a9 100644 --- a/scripts/t/license-testdata/good/multiple-headers.cpp +++ b/scripts/t/license-testdata/good/multiple-headers.cpp @@ -1,39 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ** All rights reserved. -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** This file is part of the (whatever) of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ +** 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. +** ** GNU Lesser General Public License Usage -** 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. +** 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, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt 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. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** +** 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$ @@ -48,7 +48,7 @@ - Copyright (C) 2012 Example Corporation and/or its subsidiary(-ies). - - All rights reserved. -- Contact: http://www.qt-project.org/ +- Contact: http://www.qt-project.org/legal - - This file is part of the (crazy generated code) of the Qt Toolkit. - @@ -64,10 +64,10 @@ - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. -- * Neither the name of Nokia Corporation 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 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. +- - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 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 2f071fdd..1c3ede48 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,38 +1,38 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the (whatever) of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ +** 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. +** ** GNU Lesser General Public License Usage -** 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, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** 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 ** 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. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** +** 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/good/typical-bsd-nokia.cpp b/scripts/t/license-testdata/good/typical-bsd-nokia.cpp index 2fbc7592..c3d47702 100644 --- a/scripts/t/license-testdata/good/typical-bsd-nokia.cpp +++ b/scripts/t/license-testdata/good/typical-bsd-nokia.cpp @@ -1,8 +1,8 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ** All rights reserved. -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** This file is part of the (whatever) of the Qt Toolkit. ** @@ -18,10 +18,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation 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 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. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/scripts/t/license-testdata/good/typical-fdl-nokia.qdoc b/scripts/t/license-testdata/good/typical-fdl-nokia.qdoc index 2471e695..b18ef7be 100644 --- a/scripts/t/license-testdata/good/typical-fdl-nokia.qdoc +++ b/scripts/t/license-testdata/good/typical-fdl-nokia.qdoc @@ -1,27 +1,27 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ** All rights reserved. -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** This file is part of the (whatever) of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:FDL$ -** GNU Free Documentation License +** 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. +** +** 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. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms -** and conditions contained in a signed written agreement between you -** and Nokia. -** -** -** -** -** +** 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 fe004f97..b72a4462 100644 --- a/scripts/t/license-testdata/good/typical-lgpl-nokia.cpp +++ b/scripts/t/license-testdata/good/typical-lgpl-nokia.cpp @@ -1,39 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ** All rights reserved. -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** This file is part of the (whatever) of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ +** 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. +** ** GNU Lesser General Public License Usage -** 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, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** 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 ** 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. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** +** 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/good/typical-lgpl-only-nokia.bat b/scripts/t/license-testdata/good/typical-lgpl-only-nokia.bat index e6acb66a..c386e1aa 100644 --- a/scripts/t/license-testdata/good/typical-lgpl-only-nokia.bat +++ b/scripts/t/license-testdata/good/typical-lgpl-only-nokia.bat @@ -1,8 +1,8 @@ :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: :: -:: Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +:: Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). :: All rights reserved. -:: Contact: http://www.qt-project.org/ +:: Contact: http://www.qt-project.org/legal :: :: This file is part of the (whatever) of the Qt Toolkit. :: diff --git a/scripts/t/license-testdata/reference/header.BSD b/scripts/t/license-testdata/reference/header.BSD index dbc7bf36..4d0e8b3d 100644 --- a/scripts/t/license-testdata/reference/header.BSD +++ b/scripts/t/license-testdata/reference/header.BSD @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the FOO module of the Qt Toolkit. ** @@ -17,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation 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 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. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/scripts/t/license-testdata/reference/header.FDL b/scripts/t/license-testdata/reference/header.FDL index c1a7cdf4..e5ee78fb 100644 --- a/scripts/t/license-testdata/reference/header.FDL +++ b/scripts/t/license-testdata/reference/header.FDL @@ -1,26 +1,26 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:FDL$ -** GNU Free Documentation License +** 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. +** +** 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. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms -** and conditions contained in a signed written agreement between you -** and Nokia. -** -** -** -** -** +** 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 b/scripts/t/license-testdata/reference/header.LGPL index 214f7b81..19b458e8 100644 --- a/scripts/t/license-testdata/reference/header.LGPL +++ b/scripts/t/license-testdata/reference/header.LGPL @@ -1,38 +1,38 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the FOO module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ +** 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. +** ** GNU Lesser General Public License Usage -** 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, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** 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 ** 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. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** +** 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/reference/header.LGPL-ONLY b/scripts/t/license-testdata/reference/header.LGPL-ONLY index 38a6e26b..aa112555 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) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the FOO module of the Qt Toolkit. ** |