Merge remote-tracking branch 'origin/5.11' into dev

Change-Id: I6575af293ea023aa726b620f4d834e8430cc0462

9 files changed, 48 insertions, 48 deletions

diff --git a/dist/changes-5.11.1 b/dist/changes-5.11.1
new file mode 100644
index 0000000..030ea3f
--- /dev/null
+++ b/dist/changes-5.11.1
@@ -0,0 +1,24 @@
+Qt 5.11.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.11.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.11 series is binary compatible with the 5.10.x series.
+Applications compiled for 5.10 will continue to run with 5.11.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                              Qt 5.11.1 Changes                           *
+****************************************************************************
+
+ - This release contains only minor code improvements.
diff --git a/examples/canvas3d/framebuffer/doc/src/framebuffer.qdoc b/examples/canvas3d/framebuffer/doc/src/framebuffer.qdoc
index e42e9c1..d4d5d74 100644
--- a/examples/canvas3d/framebuffer/doc/src/framebuffer.qdoc
+++ b/examples/canvas3d/framebuffer/doc/src/framebuffer.qdoc
@@ -53,7 +53,7 @@
     \since QtCanvas3D 1.0
     \title Framebuffer Example
     \ingroup qtcanvas3d-examples
-    \brief Render into a framebuffer and use it as a texture
+    \brief Render into a framebuffer and use it as a texture.
 
     The Framebuffer Example shows how to render into a framebuffer, create a
     texture of it, and apply the texture to an object in normal on-screen
diff --git a/examples/canvas3d/interaction/doc/src/interaction.qdoc b/examples/canvas3d/interaction/doc/src/interaction.qdoc
index 560cabe..7a7348a 100644
--- a/examples/canvas3d/interaction/doc/src/interaction.qdoc
+++ b/examples/canvas3d/interaction/doc/src/interaction.qdoc
@@ -53,7 +53,7 @@
     \since QtCanvas3D 1.0
     \title Interaction Example
     \ingroup qtcanvas3d-examples
-    \brief Interact with an object in canvas using Qt Quick Controls
+    \brief Interact with an object in canvas using Qt Quick Controls.
 
     The Interaction Example concentrates on the interaction between
     \l {Qt Quick Controls} and the objects displayed in Canvas3D. This
diff --git a/examples/canvas3d/jsonmodels/doc/src/jsonmodels.qdoc b/examples/canvas3d/jsonmodels/doc/src/jsonmodels.qdoc
index b709c81..1d70737 100644
--- a/examples/canvas3d/jsonmodels/doc/src/jsonmodels.qdoc
+++ b/examples/canvas3d/jsonmodels/doc/src/jsonmodels.qdoc
@@ -53,7 +53,7 @@
     \since QtCanvas3D 1.0
     \title JSON Models Example
     \ingroup qtcanvas3d-examples
-    \brief Load and display several JSON models
+    \brief Load and display several JSON models.
 
     The JSON Models Example demonstrates loading and displaying more than
     one JSON model and more than one texture. It also implements simple
diff --git a/examples/canvas3d/quickitemtexture/doc/src/quickitemtexture.qdoc b/examples/canvas3d/quickitemtexture/doc/src/quickitemtexture.qdoc
index 6a6342f..ab15d90 100644
--- a/examples/canvas3d/quickitemtexture/doc/src/quickitemtexture.qdoc
+++ b/examples/canvas3d/quickitemtexture/doc/src/quickitemtexture.qdoc
@@ -53,7 +53,7 @@
     \since QtCanvas3D 1.0
     \title Qt Quick Item as Texture Example
     \ingroup qtcanvas3d-examples
-    \brief A simple cube with a Qt Quick item as a texture
+    \brief A simple cube with a Qt Quick item as a texture.
 
     The Qt Quick Item as Texture example shows how to use other Qt Quick items as
     a texture source for Qt Canvas3D textures.
diff --git a/examples/canvas3d/textureandlight/doc/src/textureandlight.qdoc b/examples/canvas3d/textureandlight/doc/src/textureandlight.qdoc
index dc180fb..0d1b60f 100644
--- a/examples/canvas3d/textureandlight/doc/src/textureandlight.qdoc
+++ b/examples/canvas3d/textureandlight/doc/src/textureandlight.qdoc
@@ -53,7 +53,7 @@
     \since QtCanvas3D 1.0
     \title Lit and Textured Cube Example
     \ingroup qtcanvas3d-examples
-    \brief A simple cube with texturing and lighting
+    \brief A simple cube with texturing and lighting.
 
     The Lit and Textured Cube example goes through the basics of using
     Qt Canvas 3D.
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$
 **
 ****************************************************************************/