diff options
author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-03-26 08:27:43 +0100 |
---|---|---|
committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-03-26 08:42:07 +0000 |
commit | 03f94895802d90964ddcc3973a17bda68afb0b54 (patch) | |
tree | a82936e237da7518381657b4764b7a3e17db4d9b /doc/src/serviceframework/snippets/code/doc_src_lgpl.qdoc | |
parent | 6707b04daf9599f2167226bdeec5b726918a3e6a (diff) |
Update all license headers
Some files had wrong licenses too.
Change-Id: I7f940d4a136d102cb2c7755702308938530158c4
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
Diffstat (limited to 'doc/src/serviceframework/snippets/code/doc_src_lgpl.qdoc')
-rw-r--r-- | doc/src/serviceframework/snippets/code/doc_src_lgpl.qdoc | 40 |
1 files changed, 13 insertions, 27 deletions
diff --git a/doc/src/serviceframework/snippets/code/doc_src_lgpl.qdoc b/doc/src/serviceframework/snippets/code/doc_src_lgpl.qdoc index ed933b4b..57fc867c 100644 --- a/doc/src/serviceframework/snippets/code/doc_src_lgpl.qdoc +++ b/doc/src/serviceframework/snippets/code/doc_src_lgpl.qdoc @@ -1,40 +1,26 @@ /**************************************************************************** ** -** Copyright (C) 2012 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. ** -** $QT_BEGIN_LICENSE:LGPL$ +** $QT_BEGIN_LICENSE:FDL$ ** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: 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 -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** +** 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 +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. ** $QT_END_LICENSE$ ** ****************************************************************************/ |