Merge remote-tracking branch 'origin/4.12' into qds-1.50qds/v1.5.0-rc1

Change-Id: Iee9542b518367018b6e672ff920bfdb411639f8b

16 files changed, 0 insertions, 16 deletions

diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-3d-assets.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-3d-assets.qdoc
index ce448c3f20..94a949d868 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-3d-assets.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-3d-assets.qdoc
@@ -27,7 +27,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \page exporting-3d-assets.html
     \if defined(qtdesignstudio)
     \previouspage qtbridge-sketch-using.html
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-blender.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-blender.qdoc
index ff22f15c6b..4de01d77df 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-blender.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-blender.qdoc
@@ -26,7 +26,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage {Qt Design Studio Manual}
     \page exporting-from-blender.html
     \previouspage exporting-3d-assets.html
     \nextpage exporting-from-maya.html
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-maya.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-maya.qdoc
index 8903bc238a..eab2e007e2 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-maya.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-maya.qdoc
@@ -26,7 +26,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \page exporting-from-maya.html
     \previouspage exporting-from-blender.html
     \if defined (qtdesignstudio)
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-camera.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-camera.qdoc
index 0c33b4bc20..cd5ef0566d 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-camera.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-camera.qdoc
@@ -26,7 +26,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage {Qt Design Studio Manual}
     \page studio-3d-camera.html
     \previouspage studio-3d-lights.html
     \nextpage studio-3d-scene-environment.html
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-components.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-components.qdoc
index 38a71a1b53..7f6e7c88ca 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-components.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-components.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage {Qt Design Studio Manual}
     \page studio-3d-components.html
     \previouspage studio-3d-view.html
     \nextpage studio-3d-node.html
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-design-mode.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-design-mode.qdoc
index 947e72cc25..3d9da455cb 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-design-mode.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-design-mode.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \page studio-3d-design-mode.html
     \if defined (qtdesignstudio)
     \previouspage studio-3d.html
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-editor.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-editor.qdoc
index 89a6b7742d..5b7fe602d5 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-editor.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-editor.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \previouspage studio-3d-design-mode.html
     \page studio-3d-editor.html
     \nextpage studio-3d-view.html
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-importing.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-importing.qdoc
index d8025677cf..1cab52e700 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-importing.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-importing.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \page studio-importing-3d.html
     \if defined(qtdesignstudio)
     \previouspage studio-importing-2d.html
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-lights.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-lights.qdoc
index a247785f03..cfd19be883 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-lights.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-lights.qdoc
@@ -26,7 +26,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage {Qt Design Studio Manual}
     \page studio-3d-lights.html
     \previouspage studio-3d-texture.html
     \nextpage studio-3d-camera.html
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-materials-shaders.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-materials-shaders.qdoc
index 48f853c97e..bcef409407 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-materials-shaders.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-materials-shaders.qdoc
@@ -26,7 +26,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage {Qt Design Studio Manual}
     \page studio-3d-materials.html
     \previouspage studio-3d-model.html
     \nextpage studio-3d-texture.html
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-model.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-model.qdoc
index 6e6effcab9..cfc573470f 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-model.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-model.qdoc
@@ -26,7 +26,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage {Qt Design Studio Manual}
     \page studio-3d-model.html
     \previouspage studio-3d-node.html
     \nextpage studio-3d-materials.html
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-node.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-node.qdoc
index b9fb65731c..4377402523 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-node.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-node.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \previouspage studio-3d-components.html
     \page studio-3d-node.html
     \nextpage studio-3d-model.html
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-scene-environment.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-scene-environment.qdoc
index 3844439569..16653e7f4b 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-scene-environment.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-scene-environment.qdoc
@@ -26,7 +26,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage {Qt Design Studio Manual}
     \page studio-3d-scene-environment.html
     \previouspage studio-3d-camera.html
     \if defined (qtdesignstudio)
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-texture.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-texture.qdoc
index 2ad8a24a81..0dd0efda24 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-texture.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-texture.qdoc
@@ -26,7 +26,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage {Qt Design Studio Manual}
     \page studio-3d-texture.html
     \previouspage studio-3d-materials.html
     \nextpage studio-3d-lights.html
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-view.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-view.qdoc
index 8a3930a3f1..de74979357 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-view.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-view.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \previouspage studio-3d-editor.html
     \page studio-3d-view.html
     \nextpage studio-3d-components.html
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d.qdoc
index 976ae9aca4..6a2939e5e9 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \page studio-3d.html
     \previouspage qmldesigner-pathview-editor.html
     \if defined(qtdesignstudio)