Merge "Merge remote-tracking branch 'origin/5.15' into dev"

3 files changed, 0 insertions, 11 deletions

diff --git a/src/quick/doc/src/advtutorial.qdoc b/src/quick/doc/src/advtutorial.qdoc
index a18d4493ea..63c70067fd 100644
--- a/src/quick/doc/src/advtutorial.qdoc
+++ b/src/quick/doc/src/advtutorial.qdoc
@@ -64,7 +64,6 @@ directory.
 
 /*!
 \title QML Advanced Tutorial 1 - Creating the Game Canvas and Blocks
-\contentspage QML Advanced Tutorial
 \previouspage QML Advanced Tutorial
 \nextpage QML Advanced Tutorial 2 - Populating the Game Canvas
 
@@ -132,7 +131,6 @@ types to get started. Next, we will populate the game canvas with some blocks.
 
 /*!
 \title QML Advanced Tutorial 2 - Populating the Game Canvas
-\contentspage QML Advanced Tutorial
 \previouspage QML Advanced Tutorial 1 - Creating the Game Canvas and Blocks
 \nextpage QML Advanced Tutorial 3 - Implementing the Game Logic
 
@@ -206,7 +204,6 @@ Now, we have a screen of blocks, and we can begin to add the game mechanics.
 
 /*!
 \title QML Advanced Tutorial 3 - Implementing the Game Logic
-\contentspage QML Advanced Tutorial
 \previouspage QML Advanced Tutorial 2 - Populating the Game Canvas
 \nextpage QML Advanced Tutorial 4 - Finishing Touches
 
@@ -293,7 +290,6 @@ until the next chapter - where your application becomes alive!
 
 /*!
 \title QML Advanced Tutorial 4 - Finishing Touches
-\contentspage QML Advanced Tutorial
 \previouspage QML Advanced Tutorial 3 - Implementing the Game Logic
 
 \example tutorials/samegame/samegame4
diff --git a/src/quick/doc/src/dynamicview-tutorial.qdoc b/src/quick/doc/src/dynamicview-tutorial.qdoc
index 6f44ba1947..d221e2ae62 100644
--- a/src/quick/doc/src/dynamicview-tutorial.qdoc
+++ b/src/quick/doc/src/dynamicview-tutorial.qdoc
@@ -50,7 +50,6 @@ directory.
 
 /*!
 \title QML Dynamic View Ordering Tutorial 1 - A Simple ListView and Delegate
-\contentspage QML Dynamic View Ordering Tutorial
 \previouspage QML Dynamic View Ordering Tutorial
 \nextpage QML Dynamic View Ordering Tutorial 2 - Dragging View Items
 
@@ -85,7 +84,6 @@ The second part of the application is the ListView itself to which we bind the m
 
 /*!
 \title QML Dynamic View Ordering Tutorial 2 - Dragging View Items
-\contentspage QML Dynamic View Ordering Tutorial
 \previouspage QML Dynamic View Ordering Tutorial 1 - A Simple ListView and Delegate
 \nextpage QML Dynamic View Ordering Tutorial 3 - Moving Dragged Items
 
@@ -128,7 +126,6 @@ so that is above other items in the stacking order and isn't obscured as it is d
 
 /*!
 \title QML Dynamic View Ordering Tutorial 3 - Moving Dragged Items
-\contentspage QML Dynamic View Ordering Tutorial
 \previouspage QML Dynamic View Ordering Tutorial 2 - Dragging View Items
 \nextpage QML Dynamic View Ordering Tutorial 4 - Sorting Items
 
@@ -180,7 +177,6 @@ property of the view and bind the \l {DelegateModel::}{model} and
 
 /*!
 \title QML Dynamic View Ordering Tutorial 4 - Sorting Items
-\contentspage QML Dynamic View Ordering Tutorial
 \previouspage QML Dynamic View Ordering Tutorial 3 - Moving Dragged Items
 
 \example tutorials/dynamicview/dynamicview4
diff --git a/src/quick/doc/src/tutorial.qdoc b/src/quick/doc/src/tutorial.qdoc
index 20021f2432..7cb5f655e8 100644
--- a/src/quick/doc/src/tutorial.qdoc
+++ b/src/quick/doc/src/tutorial.qdoc
@@ -54,7 +54,6 @@ Tutorial chapters:
 /*!
 \page qml-tutorial1.html
 \title QML Tutorial 1 - Basic Types
-\contentspage QML Tutorial
 \previouspage QML Tutorial
 \nextpage QML Tutorial 2 - QML Components
 
@@ -112,7 +111,6 @@ qmlscene tutorials/helloworld/tutorial1.qml
 /*!
 \page qml-tutorial2.html
 \title QML Tutorial 2 - QML Components
-\contentspage QML Tutorial
 \previouspage QML Tutorial 1 - Basic Types
 \nextpage QML Tutorial 3 - States and Transitions
 
@@ -184,7 +182,6 @@ We can react to any signal of our component through a property of the name \e 'o
 /*!
 \page qml-tutorial3.html
 \title QML Tutorial 3 - States and Transitions
-\contentspage QML Tutorial
 \previouspage QML Tutorial 2 - QML Components
 
 In this chapter, we make this example a little bit more dynamic by introducing states and transitions.