diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-02-16 14:04:09 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-02-18 14:43:55 +0000 |
| commit | 540dfe7448e55d8813ee96b485e2dec931283ae4 (patch) | |
| tree | 6533e4a96a484886d6cf2ce5546a538e60956b3c /tests/auto/qplaceattribute | |
| parent | 682fbcc50b33a9425c949b086de1ddebbf494a12 (diff) | |
| download | qtlocation-540dfe7448e55d8813ee96b485e2dec931283ae4.tar.gz | |
Update BSD and LGPLv2.1 licenses
- Removes subsidiary extension from Qt Company
- Replaces remaining occurrences of Digia in BSD and LGPLv2.1
Change-Id: I7467a6744af7d1c3aef3c29118f219399162a18c
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
Diffstat (limited to 'tests/auto/qplaceattribute')
| -rw-r--r-- | tests/auto/qplaceattribute/tst_qplaceattribute.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qplaceattribute/tst_qplaceattribute.cpp b/tests/auto/qplaceattribute/tst_qplaceattribute.cpp index 855e06e7..b9e3dc8c 100644 --- a/tests/auto/qplaceattribute/tst_qplaceattribute.cpp +++ b/tests/auto/qplaceattribute/tst_qplaceattribute.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies). +** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt-project.org/legal ** ** This file is part of the test suite of the Qt Toolkit. @@ -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$ |