diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-23 03:02:05 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-23 03:02:05 +0200 |
commit | ec50da159c2a745776dabd39b08ef90907b808df (patch) | |
tree | 8b90dd05f9ebb4239c76ab29e25ba46c666f0079 /src | |
parent | 8e763164f18ca30ad7fe2678dfce6fc30f975667 (diff) | |
parent | 43f3a363133a93e2c6e465d149476a18f3a5d4e5 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I6575af293ea023aa726b620f4d834e8430cc0462
Diffstat (limited to 'src')
-rw-r--r-- | src/imports/qtcanvas3d/contextattributes.cpp | 2 | ||||
-rw-r--r-- | src/imports/qtcanvas3d/doc/src/qtcanvas3d-index.qdoc | 30 | ||||
-rw-r--r-- | src/imports/qtcanvas3d/doc/src/qtcanvas3d.qdoc | 30 |
3 files changed, 19 insertions, 43 deletions
diff --git a/src/imports/qtcanvas3d/contextattributes.cpp b/src/imports/qtcanvas3d/contextattributes.cpp index b1441dc..ef7ae6f 100644 --- a/src/imports/qtcanvas3d/contextattributes.cpp +++ b/src/imports/qtcanvas3d/contextattributes.cpp @@ -49,7 +49,7 @@ QT_CANVAS3D_BEGIN_NAMESPACE * \qmltype Canvas3DContextAttributes * \since QtCanvas3D 1.0 * \inqmlmodule QtCanvas3D - * \brief Attribute set for Context3D + * \brief Attribute set for Context3D. * * Canvas3DContextAttributes is an attribute set that can be given as parameter on first call to * Canvas3D object's \l{Canvas3D::getContext}{getContext(string type, Canvas3DContextAttributes options)} diff --git a/src/imports/qtcanvas3d/doc/src/qtcanvas3d-index.qdoc b/src/imports/qtcanvas3d/doc/src/qtcanvas3d-index.qdoc index 24cae6e..66c3bfe 100644 --- a/src/imports/qtcanvas3d/doc/src/qtcanvas3d-index.qdoc +++ b/src/imports/qtcanvas3d/doc/src/qtcanvas3d-index.qdoc @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the QtCanvas3D module of the Qt Toolkit. +** 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 @@ -14,25 +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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** 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/src/imports/qtcanvas3d/doc/src/qtcanvas3d.qdoc b/src/imports/qtcanvas3d/doc/src/qtcanvas3d.qdoc index 9bee436..d01264c 100644 --- a/src/imports/qtcanvas3d/doc/src/qtcanvas3d.qdoc +++ b/src/imports/qtcanvas3d/doc/src/qtcanvas3d.qdoc @@ -3,9 +3,9 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the QtCanvas3D module of the Qt Toolkit. +** 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 @@ -14,25 +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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** 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$ ** ****************************************************************************/ |