Merge remote-tracking branch 'origin/5.9' into 5.10

Conflicts:
	src/quick/items/qquickwindow.cpp
	src/quick/scenegraph/qsgrenderloop.cpp

Change-Id: Idd7106995b5545fcac869e9056a365ef9edb36ca

4 files changed, 4 insertions, 4 deletions

diff --git a/src/qml/doc/src/cppintegration/data.qdoc b/src/qml/doc/src/cppintegration/data.qdoc
index c3d073872a..65559f640a 100644
--- a/src/qml/doc/src/cppintegration/data.qdoc
+++ b/src/qml/doc/src/cppintegration/data.qdoc
@@ -347,7 +347,7 @@ them with default constructed values, do not use the indexed delete operator
 ("delete sequence[i]") but instead use the \c {splice} function
 ("sequence.splice(startIndex, deleteCount)").
 
-\section2 Value types
+\section2 Value Types
 
 Some value types in Qt such as QPoint are represented in JavaScript as objects
 that have the same properties and functions like in the C++ API. The same
diff --git a/src/qml/doc/src/qmllanguageref/documents/topic.qdoc b/src/qml/doc/src/qmllanguageref/documents/topic.qdoc
index 840afa9a0e..bc104e9c8a 100644
--- a/src/qml/doc/src/qmllanguageref/documents/topic.qdoc
+++ b/src/qml/doc/src/qmllanguageref/documents/topic.qdoc
@@ -86,7 +86,7 @@ Please see the documentation about the \l{qtqml-syntax-basics.html}
 documentation about \l{qtqml-javascript-topic.html}
 {integrating QML and JavaScript} for in-depth information on that topic.
 
-\section1 Defining Object Types through QML Documents
+\section1 Defining Object Types Through QML Documents
 
 As described briefly in the previous section, a document implicitly defines
 a QML object type.  One of the core principles of QML is the ability to define
diff --git a/src/qml/doc/src/qmllanguageref/typesystem/objecttypes.qdoc b/src/qml/doc/src/qmllanguageref/typesystem/objecttypes.qdoc
index b0aab1c73a..d1d28381b5 100644
--- a/src/qml/doc/src/qmllanguageref/typesystem/objecttypes.qdoc
+++ b/src/qml/doc/src/qmllanguageref/typesystem/objecttypes.qdoc
@@ -50,7 +50,7 @@ and registering the type with the QML engine, as discussed in
 \section1 Defining Object Types from QML
 
 
-\section2 Defining Object Types through QML Documents
+\section2 Defining Object Types Through QML Documents
 
 Plugin writers and application developers may provide types defined as QML
 documents.  A QML document, when visible to the QML import system, defines a
diff --git a/src/qml/doc/src/statemachine.qdoc b/src/qml/doc/src/statemachine.qdoc
index 56a8746e1e..b0bfef4f69 100644
--- a/src/qml/doc/src/statemachine.qdoc
+++ b/src/qml/doc/src/statemachine.qdoc
@@ -61,7 +61,7 @@
 
   \annotatedlist statemachine-qmltypes
 
-  \section1 Using both QtQuick and QtQml.StateMachine imports
+  \section1 Using Both QtQuick and QtQml.StateMachine Imports
 
   \warning If you're attempting to import both \l{QtQuick} and
     \e{QtQml.StateMachine} in one single QML file, make sure to import