diff options
| author | Jani Heikkinen <[email protected]> | 2016-01-13 14:55:34 +0200 |
|---|---|---|
| committer | Lars Knoll <[email protected]> | 2016-01-14 20:43:46 +0000 |
| commit | 71404b0be1468fbf53d2ffb11f9f513371f9b1c5 (patch) | |
| tree | 310aaaf98fe4348c840e81727e37017ca46863ae /header.FDL | |
| parent | f1b796e3badaeaecfff564fc6a06df37da515333 (diff) | |
Add new license header templates and license fileswip/lite
From Qt 5.7 -> LGPL v2.1 isn't an option anymore, see
http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/
Added new header templates and corresponding license files. Unnecessary
ones will be removed later when license header change is done to all
Qt modules
Change-Id: I8c482d81e40c03f0c6395e437f55527617aa6b58
Reviewed-by: Tuukka Turunen <[email protected]>
Reviewed-by: Iikka Eklund <[email protected]>
Reviewed-by: Lars Knoll <[email protected]>
Diffstat (limited to 'header.FDL')
| -rw-r--r-- | header.FDL | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/header.FDL b/header.FDL index 2df4fb5aef7..90195db138b 100644 --- a/header.FDL +++ b/header.FDL @@ -1,7 +1,7 @@ /**************************************************************************** ** -** 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 the documentation of the Qt Toolkit. ** @@ -11,8 +11,8 @@ ** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** 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 Usage ** Alternatively, this file may be used under the terms of the GNU Free @@ -20,7 +20,7 @@ ** 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. +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. ** $QT_END_LICENSE$ ** ****************************************************************************/ |