diff options
| author | Oliver Wolff <oliver.wolff@theqtcompany.com> | 2016-01-14 12:53:25 +0100 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@theqtcompany.com> | 2016-01-14 14:24:47 +0000 |
| commit | 2f1fa954dfbd58033eabf160f1e89785cbaf1bd4 (patch) | |
| tree | c267ac141e68097987991c041c2b040e573b3e8d | |
| parent | ad508bb53c60b9eaa9582beaab141024371ac6a7 (diff) | |
Correct documentation license
Change-Id: I1a8ad041a1135b08de06a47f8f4daa52546fef31
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| -rw-r--r-- | Qt4VS2003/Doc/externallinks.qdoc | 17 | ||||
| -rw-r--r-- | Qt4VS2003/Doc/vs-addin.qdoc | 17 |
2 files changed, 16 insertions, 18 deletions
diff --git a/Qt4VS2003/Doc/externallinks.qdoc b/Qt4VS2003/Doc/externallinks.qdoc index 065c0749..2cfb2add 100644 --- a/Qt4VS2003/Doc/externallinks.qdoc +++ b/Qt4VS2003/Doc/externallinks.qdoc @@ -5,7 +5,7 @@ ** ** This file is part of the documentation of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ +** $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 @@ -14,14 +14,13 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** +** 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: https://www.gnu.org/licenses/fdl-1.3.html. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/Qt4VS2003/Doc/vs-addin.qdoc b/Qt4VS2003/Doc/vs-addin.qdoc index 7a5ee074..f932d8db 100644 --- a/Qt4VS2003/Doc/vs-addin.qdoc +++ b/Qt4VS2003/Doc/vs-addin.qdoc @@ -5,7 +5,7 @@ ** ** This file is part of the documentation of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ +** $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 @@ -14,14 +14,13 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** +** 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: https://www.gnu.org/licenses/fdl-1.3.html. ** $QT_END_LICENSE$ ** ****************************************************************************/ |