Merge remote-tracking branch 'origin/4.12'

Change-Id: Ibbf9f16677a58bdcdd3ce63701ffa34db6f44916
2020-05-11 11:36:22 +02:00
parent b9e79f7852 c370d345f1
commit 20ef5c6de3
270 changed files with 2794 additions and 432 deletions
--- a/doc/qtcreator/src/howto/creator-external-tools.qdoc
+++ b/doc/qtcreator/src/howto/creator-external-tools.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************

 /*!
-    \contentspage index.html
    \page creator-editor-external.html
    \if defined(qtdesignstudio)
    \previouspage creator-qml-performance-monitor.html
--- a/doc/qtcreator/src/howto/creator-help.qdoc
+++ b/doc/qtcreator/src/howto/creator-help.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/

 /*!
-    \contentspage index.html
    \page creator-help.html
    \if defined(qtdesignstudio)
    \previouspage {Examples and Tutorials}
--- a/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc
+++ b/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************

 /*!
-    \contentspage index.html
    \page creator-keyboard-shortcuts.html
    \if defined(qtdesignstudio)
    \previouspage studio-platforms.html
--- a/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc
+++ b/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/

 /*!
-    \contentspage index.html
    \previouspage creator-ctf-visualizer.html
    \page creator-autotest.html
    \nextpage creator-advanced.html
--- a/doc/qtcreator/src/howto/creator-only/creator-cli.qdoc
+++ b/doc/qtcreator/src/howto/creator-only/creator-cli.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************

 /*!
-    \contentspage index.html
    \previouspage creator-project-nimble.html
    \page creator-cli.html
    \nextpage creator-keyboard-shortcuts.html
--- a/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc
+++ b/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************

 /*!
-    \contentspage index.html
    \previouspage creator-faq.html
    \page creator-how-tos.html
    \nextpage creator-known-issues.html
--- a/doc/qtcreator/src/howto/creator-only/creator-sessions.qdoc
+++ b/doc/qtcreator/src/howto/creator-only/creator-sessions.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************

 /*!
-    \contentspage index.html
    \previouspage creator-sharing-project-settings.html
    \page creator-project-managing-sessions.html
    \nextpage creator-design-mode.html
--- a/doc/qtcreator/src/howto/creator-only/creator-task-lists.qdoc
+++ b/doc/qtcreator/src/howto/creator-only/creator-task-lists.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************

 /*!
-    \contentspage index.html
    \previouspage creator-editor-external.html
    \page creator-task-lists.html
    \nextpage creator-telemetry.html
--- a/doc/qtcreator/src/howto/creator-only/creator-telemetry.qdoc
+++ b/doc/qtcreator/src/howto/creator-only/creator-telemetry.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/

 /*!
-    \contentspage index.html
    \previouspage creator-task-lists.html
    \page creator-telemetry.html
    \nextpage creator-help-overview.html
--- a/doc/qtcreator/src/howto/creator-only/qtcreator-faq.qdoc
+++ b/doc/qtcreator/src/howto/creator-only/qtcreator-faq.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/

 /*!
-    \contentspage index.html
    \previouspage creator-help.html
    \page creator-faq.html
    \nextpage creator-how-tos.html
--- a/doc/qtcreator/src/howto/creator-sidebars.qdoc
+++ b/doc/qtcreator/src/howto/creator-sidebars.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/

 /*!
-    \contentspage index.html
    \page creator-sidebars.html
    \previouspage creator-views.html
    \nextpage creator-project-managing-workspaces.html
--- a/doc/qtcreator/src/howto/creator-ui.qdoc
+++ b/doc/qtcreator/src/howto/creator-ui.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************

 /*!
-    \contentspage index.html
    \page creator-quick-tour.html
    \if defined(qtdesignstudio)
    \previouspage qtbridge-ps-using.html
@@ -256,7 +255,6 @@
 */

 /*!
-    \contentspage index.html
    \page creator-modes.html
    \previouspage creator-quick-tour.html
    \nextpage creator-views.html
@@ -331,7 +329,6 @@
 */

 /*!
-    \contentspage index.html
    \page creator-output-panes.html
    \previouspage creator-project-managing-workspaces.html
    \if defined(qtdesignstudio)
--- a/doc/qtcreator/src/howto/creator-views.qdoc
+++ b/doc/qtcreator/src/howto/creator-views.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/

 /*!
-    \contentspage index.html
    \page creator-views.html
    \previouspage creator-modes.html
    \nextpage creator-sidebars.html
--- a/doc/qtcreator/src/howto/creator-workspaces.qdoc
+++ b/doc/qtcreator/src/howto/creator-workspaces.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/

 /*!
-    \contentspage index.html
    \previouspage creator-sidebars.html
    \page creator-project-managing-workspaces.html
    \nextpage creator-output-panes.html