From afde1b141ea24ee9141089d3d4bf9a8a835e3a32 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Mon, 15 Jun 2015 15:02:27 +0200 Subject: Licensing: Replace Digia by The Qt Company MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Id64c84ef6bae46a51c9e13d91ddb8d1ae3cc851a Reviewed-by: Tuukka Turunen Reviewed-by: Topi Reiniö --- doc/src/legal/licenses.qdoc | 2 +- doc/src/legal/opensourcelicense.qdoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc index c4da41378..5a45c7aa4 100644 --- a/doc/src/legal/licenses.qdoc +++ b/doc/src/legal/licenses.qdoc @@ -364,7 +364,7 @@ This page lists the licenses used, names the authors, and links to the places where it is used. - Digia gratefully acknowledges these and other contributions + The Qt Company gratefully acknowledges these and other contributions to Qt. We recommend that programs that use Qt also acknowledge these contributions, and quote these license statements in an appendix to the documentation. diff --git a/doc/src/legal/opensourcelicense.qdoc b/doc/src/legal/opensourcelicense.qdoc index 5d7e736eb..a3299c6e4 100644 --- a/doc/src/legal/opensourcelicense.qdoc +++ b/doc/src/legal/opensourcelicense.qdoc @@ -39,7 +39,7 @@ money. The Free Software Foundation, the creator of the GNU GPL, speaks of free in this context as in "free speech", not as in "no cost". - Digia supports the free software concept by providing the Qt Open Source + The Qt Company supports the free software concept by providing the Qt Open Source Edition, which is licensed under the \l{GNU Lesser General Public License (LGPL)} version 3 and the GNU LGPL version 2.1. You can use this edition of Qt to create and distribute software with licenses -- cgit v1.2.3