From 540dfe7448e55d8813ee96b485e2dec931283ae4 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Mon, 16 Feb 2015 14:04:09 +0100 Subject: 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 --- config.tests/geoclue-satellite/main.cpp | 4 ++-- config.tests/geoclue/main.cpp | 6 +++--- config.tests/gypsy/main.cpp | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'config.tests') diff --git a/config.tests/geoclue-satellite/main.cpp b/config.tests/geoclue-satellite/main.cpp index 3b182f2e..7942eb05 100644 --- a/config.tests/geoclue-satellite/main.cpp +++ b/config.tests/geoclue-satellite/main.cpp @@ -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/config.tests/geoclue/main.cpp b/config.tests/geoclue/main.cpp index aa23b5ad..c5484e83 100644 --- a/config.tests/geoclue/main.cpp +++ b/config.tests/geoclue/main.cpp @@ -2,7 +2,7 @@ ** ** Copyright (C) 2013 Jolla Ltd. ** Contact: Aaron McCarthy -** 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 QtLocation module of the Qt Toolkit. @@ -25,8 +25,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/config.tests/gypsy/main.cpp b/config.tests/gypsy/main.cpp index 29a29285..c53c24d1 100644 --- a/config.tests/gypsy/main.cpp +++ b/config.tests/gypsy/main.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 QtLocation module 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$ -- cgit v1.2.1