diff options
| author | Tobias Hunger <[email protected]> | 2016-01-15 14:51:16 +0100 |
|---|---|---|
| committer | Tobias Hunger <[email protected]> | 2016-01-19 13:09:03 +0000 |
| commit | 43800a6aa8111550ce6d0c4992c09bb657ef234e (patch) | |
| tree | dee522d96b644e3d442787479d09fd446b9cfe50 /doc/api/first-plugin.qdoc | |
| parent | ea767d961b407386200f98479d2e68e767a95f40 (diff) | |
Update License according to agreement with Free Qt Foundation
* Update license in documentation files. Stay at FDL, but update
URLs as well as license for examples, etc.
Change-Id: I5e8cb5a20f0e9d52fba1d937b7c73197d69dd747
Reviewed-by: Tobias Hunger <[email protected]>
Diffstat (limited to 'doc/api/first-plugin.qdoc')
| -rw-r--r-- | doc/api/first-plugin.qdoc | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/doc/api/first-plugin.qdoc b/doc/api/first-plugin.qdoc index 995f15a51b6..a4e04d7c81a 100644 --- a/doc/api/first-plugin.qdoc +++ b/doc/api/first-plugin.qdoc @@ -1,20 +1,27 @@ -/************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of Qt Creator +** This file is part of the Qt Creator documentation. ** +** 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 The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Free Documentation License -** +** 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. -** +** 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: https://www.gnu.org/licenses/fdl-1.3.html. ** -**************************************************************************/ +****************************************************************************/ /*! \page first-plugin.html |