diff options
Diffstat (limited to 'tools/qdoc3/doc/qdoc-manual.qdoc')
| -rw-r--r-- | tools/qdoc3/doc/qdoc-manual.qdoc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/tools/qdoc3/doc/qdoc-manual.qdoc b/tools/qdoc3/doc/qdoc-manual.qdoc index 7815c563a9..79515cecd5 100644 --- a/tools/qdoc3/doc/qdoc-manual.qdoc +++ b/tools/qdoc3/doc/qdoc-manual.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 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,9 +10,9 @@ ** 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 @@ -3723,11 +3723,11 @@ \l{GNU Lesser General Public License (LGPL)} or the \l{Qt Commercial Edition}{Qt Commercial License Agreement}, but rather under specific licenses from the original authors. Some pieces of code were developed - by Digia and others originated from third parties. + by The Qt Company and others originated from third parties. 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. @@ -4080,10 +4080,10 @@ <shortdesc>the QWidget class is the base class of all user interface objects.</shortdesc> <prolog> <author>Qt Development Frameworks</author> - <publisher>Digia</publisher> + <publisher>The Qt Company</publisher> <copyright> - <copyryear year="2011"/> - <copyrholder>Digia</copyrholder> + <copyryear year="2015"/> + <copyrholder>The Qt Company Ltd</copyrholder> </copyright> <permissions view="all"/> <metadata> @@ -7019,9 +7019,9 @@ \code dita.metadata.default.author = Qt Development Frameworks dita.metadata.default.permissions = all - dita.metadata.default.publisher = Digia - dita.metadata.default.copyryear = 2011 - dita.metadata.default.copyrholder = Digia + dita.metadata.default.publisher = The Qt Company + dita.metadata.default.copyryear = 2015 + dita.metadata.default.copyrholder = The Qt Company Ltd dita.metadata.default.audience = programmer \endcode |