diff options
Diffstat (limited to 'doc/src/legal/fdl.qdoc')
| -rw-r--r-- | doc/src/legal/fdl.qdoc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/doc/src/legal/fdl.qdoc b/doc/src/legal/fdl.qdoc index 2ba8b184..257b103e 100644 --- a/doc/src/legal/fdl.qdoc +++ b/doc/src/legal/fdl.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/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. Please review the following information to ensure +** 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$ @@ -33,10 +33,10 @@ Qt documentation is licensed under the terms of the GNU Free Documentation License version 1.3, as published by the Free Software Foundation. Alternatively, you may use the documentation in accordance with the terms - contained in a written agreement between you and Digia. + contained in a written agreement between you and The Qt Company. - The Qt Toolkit is Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies) and other contributors.\br - Contact: \l{http://www.qt-project.org/legal} + The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd and other contributors.\br + Contact: \l{http://www.qt.io/licensing/} Reference: \l{GNU Free Documentation License} |