diff options
| author | Iikka Eklund <iikka.eklund@digia.com> | 2012-09-25 09:31:19 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-29 05:57:45 (GMT) |
| commit | 619136931e2c985377348d196d488e429a4858d6 (patch) | |
| tree | 627b1197a7888451c26df27dcd3b0d1e34c127ce /doc/src/legal/opensourceedition.qdoc | |
| parent | 14dabf0f354b4f3817393d9b9e52473f88b896da (diff) | |
| download | Qt-619136931e2c985377348d196d488e429a4858d6.zip Qt-619136931e2c985377348d196d488e429a4858d6.tar.gz Qt-619136931e2c985377348d196d488e429a4858d6.tar.bz2 | |
Change copyrights from Nokia to Digia
Change copyrights and license headers from Nokia to Digia
Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Diffstat (limited to 'doc/src/legal/opensourceedition.qdoc')
| -rw-r--r-- | doc/src/legal/opensourceedition.qdoc | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/doc/src/legal/opensourceedition.qdoc b/doc/src/legal/opensourceedition.qdoc index 3632608..2393b9b 100644 --- a/doc/src/legal/opensourceedition.qdoc +++ b/doc/src/legal/opensourceedition.qdoc @@ -1,26 +1,26 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:FDL$ -** GNU Free Documentation License +** Commercial License Usage +** 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. +** +** 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. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms -** and conditions contained in a signed written agreement between you -** and Nokia. -** -** -** -** -** +** 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$ ** ****************************************************************************/ |