diff options
author | Jani Heikkinen <jani.heikkinen@qt.io> | 2017-05-04 14:02:19 +0300 |
---|---|---|
committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2017-05-09 09:57:01 +0000 |
commit | ee2387fef811b9060b1d93325c7cb55472077164 (patch) | |
tree | 419cdde497342e09dba8bc80001ea7cd160c8759 /doc/src/plugins/qml-feedback.qdoc | |
parent | 1c9364698027822516a0b9e28264b5c652b7fd8f (diff) |
Fix licensing
- Update old FDL & BSD license headers
- Change old LGPL3 license headers to LGPL
- Delete old, unnecessary license files
Task-number: QTBUG-57147
Change-Id: I443dd2f55caf50d62464e7764a4fb642b0538ded
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'doc/src/plugins/qml-feedback.qdoc')
-rw-r--r-- | doc/src/plugins/qml-feedback.qdoc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/src/plugins/qml-feedback.qdoc b/doc/src/plugins/qml-feedback.qdoc index 4f79f92..dfacd75 100644 --- a/doc/src/plugins/qml-feedback.qdoc +++ b/doc/src/plugins/qml-feedback.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 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$ ** ****************************************************************************/ |