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

Change-Id: Iee9542b518367018b6e672ff920bfdb411639f8b
author: Tim Jenssen <tim.jenssen@qt.io> 2020-05-12 09:59:55 +0200
committer: Tim Jenssen <tim.jenssen@qt.io> 2020-05-12 09:59:55 +0200
commit: c9b56717542749b271d5e48c7bf7698884e94f8f (patch)
tree: 424aabcf1197798d2294cb05eb047d51c4f82bce
parent: 6ab2f93f184470998e452cd709a881258dfef6a0 (diff)
parent: 8e1169f4bf6fc97f7f864cefeb5a273f271798cf (diff)
208 files changed, 238 insertions, 738 deletions
diff --git a/.gitignore b/.gitignore
index a16cefa843..1579006f2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -125,6 +125,7 @@ compile_commands.json
 /doc/html/qtcreator/
 /doc/html/qtcreator-dev/
 /doc/html/qtdesignstudio/
+/doc/qtdesignstudio/doc/html
 /lib/
 /lib64/
 /libexec/
diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake
index f6387b7919..d88cff2fc6 100644
--- a/cmake/QtCreatorAPI.cmake
+++ b/cmake/QtCreatorAPI.cmake
@@ -3,6 +3,10 @@ if(QT_CREATOR_API_DEFINED)
 endif()
 set(QT_CREATOR_API_DEFINED TRUE)
 
+if (CMAKE_VERSION VERSION_LESS 3.16)
+  set(BUILD_WITH_PCH OFF)
+endif()
+
 include(FeatureSummary)
 
 #
diff --git a/dist/changes-4.12.1.md b/dist/changes-4.12.1.md
new file mode 100644
index 0000000000..8a80e1f0f7
--- /dev/null
+++ b/dist/changes-4.12.1.md
@@ -0,0 +1,76 @@
+Qt Creator 4.12.1
+=================
+
+Qt Creator version 4.12.1 contains bug fixes.
+
+The most important changes are listed in this document. For a complete
+list of changes, see the Git log for the Qt Creator sources that
+you can check out from the public Git repository. For example:
+
+    git clone git://code.qt.io/qt-creator/qt-creator.git
+    git log --cherry-pick --pretty=oneline origin/v4.12.0..v4.12.1
+
+General
+-------
+
+* Fixed crash when changing font settings (QTCREATORBUG-14385)
+
+Editing
+-------
+
+### C++
+
+* Fixed crash when loading settings from Qt Creator < 4.11 (QTCREATORBUG-23916)
+
+### QML
+
+* Fixed semantic highlighting (QTCREATORBUG-23729, QTCREATORBUG-23777)
+* Fixed wrong symbol highlighting (QTCREATORBUG-23830)
+* Fixed warning for `palette` property (QTCREATORBUG-23830)
+
+Projects
+--------
+
+### qmake
+
+* Fixed that run button could stay disabled after parsing
+
+### CMake
+
+* Fixed issue with JOM (QTCREATORBUG-22645)
+
+### Compilation Database
+
+* Fixed issues with symbolic links (QTCREATORBUG-23511)
+
+Debugging
+---------
+
+* Fixed pretty printing of `std::unique_ptr` with custom deleter (QTCREATORBUG-23885)
+
+
+Qt Quick Designer
+-----------------
+
+* Fixed crash after building emulation layer (QTCREATORBUG-20364)
+* Fixed crash when opening `.qml` file instead of `.qml.ui` file (QDS-2011)
+
+Test Integration
+----------------
+
+* Fixed handling of test output (QTCREATORBUG-23939)
+
+Platforms
+---------
+
+### Android
+
+* Fixed crash at startup when Qt is missing in Kit (QTCREATORBUG-23963)
+* Fixed `Always use this device for this project` (QTCREATORBUG-23918)
+
+### OpenBSD
+
+* Fixed Qt ABI detection (QTCREATORBUG-23818)
+
+Credits for these changes go to:
+--------------------------------
diff --git a/doc/qtcreator/images/qmldesigner-element-size.png b/doc/qtcreator/images/qmldesigner-element-size.png
index ad2d3b666b..5c084277de 100644
--- a/doc/qtcreator/images/qmldesigner-element-size.png
+++ b/doc/qtcreator/images/qmldesigner-element-size.png
diff --git a/doc/qtcreator/images/qmldesigner-form-editor.png b/doc/qtcreator/images/qmldesigner-form-editor.png
new file mode 100644
index 0000000000..66aaa7229d
--- /dev/null
+++ b/doc/qtcreator/images/qmldesigner-form-editor.png
diff --git a/doc/qtcreator/images/qmldesigner-navigator-arrows.png b/doc/qtcreator/images/qmldesigner-navigator-arrows.png
index ecc59fcec1..404e520875 100644
--- a/doc/qtcreator/images/qmldesigner-navigator-arrows.png
+++ b/doc/qtcreator/images/qmldesigner-navigator-arrows.png
diff --git a/doc/qtcreator/images/qmldesigner-navigator.png b/doc/qtcreator/images/qmldesigner-navigator.png
index 4fe5e737c6..7aae0659cc 100644
--- a/doc/qtcreator/images/qmldesigner-navigator.png
+++ b/doc/qtcreator/images/qmldesigner-navigator.png
diff --git a/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc b/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc
index 1d0c9f6e1a..c32e8854b0 100644
--- a/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc
+++ b/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-heob.html
     \page creator-cpu-usage-analyzer.html
     \nextpage creator-cppcheck.html
diff --git a/doc/qtcreator/src/analyze/creator-analyze.qdoc b/doc/qtcreator/src/analyze/creator-analyze.qdoc
index 1e98c0f214..06fe3ce1b7 100644
--- a/doc/qtcreator/src/analyze/creator-analyze.qdoc
+++ b/doc/qtcreator/src/analyze/creator-analyze.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-troubleshooting-debugging.html
     \page creator-analyze-mode.html
     \nextpage creator-qml-performance-monitor.html
diff --git a/doc/qtcreator/src/analyze/creator-clang-static-analyzer.qdoc b/doc/qtcreator/src/analyze/creator-clang-static-analyzer.qdoc
index 1ab345bb03..c06c75ed93 100644
--- a/doc/qtcreator/src/analyze/creator-clang-static-analyzer.qdoc
+++ b/doc/qtcreator/src/analyze/creator-clang-static-analyzer.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-running-valgrind-remotely.html
     \page creator-clang-tools.html
     \nextpage creator-heob.html
diff --git a/doc/qtcreator/src/analyze/creator-cppcheck.qdoc b/doc/qtcreator/src/analyze/creator-cppcheck.qdoc
index ab45382f74..a278f2db6d 100644
--- a/doc/qtcreator/src/analyze/creator-cppcheck.qdoc
+++ b/doc/qtcreator/src/analyze/creator-cppcheck.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \previouspage creator-cpu-usage-analyzer.html
     \page creator-cppcheck.html
     \nextpage creator-ctf-visualizer.html
diff --git a/doc/qtcreator/src/analyze/creator-ctf-visualizer.qdoc b/doc/qtcreator/src/analyze/creator-ctf-visualizer.qdoc
index 5440c34fb9..87f63f95e4 100644
--- a/doc/qtcreator/src/analyze/creator-ctf-visualizer.qdoc
+++ b/doc/qtcreator/src/analyze/creator-ctf-visualizer.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-cppcheck.html
     \page creator-ctf-visualizer.html
     \nextpage creator-autotest.html
diff --git a/doc/qtcreator/src/analyze/creator-heob.qdoc b/doc/qtcreator/src/analyze/creator-heob.qdoc
index 54f0a4cf26..1c484450c9 100644
--- a/doc/qtcreator/src/analyze/creator-heob.qdoc
+++ b/doc/qtcreator/src/analyze/creator-heob.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-clang-tools.html
     \page creator-heob.html
     \nextpage creator-cpu-usage-analyzer.html
diff --git a/doc/qtcreator/src/analyze/creator-valgrind-overview.qdoc b/doc/qtcreator/src/analyze/creator-valgrind-overview.qdoc
index 7c72c362c0..919932e7a3 100644
--- a/doc/qtcreator/src/analyze/creator-valgrind-overview.qdoc
+++ b/doc/qtcreator/src/analyze/creator-valgrind-overview.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-qml-performance-monitor.html
     \page creator-valgrind-overview.html
     \nextpage creator-analyzer.html
diff --git a/doc/qtcreator/src/analyze/creator-valgrind.qdoc b/doc/qtcreator/src/analyze/creator-valgrind.qdoc
index b2b7cc7f68..210ea15f12 100644
--- a/doc/qtcreator/src/analyze/creator-valgrind.qdoc
+++ b/doc/qtcreator/src/analyze/creator-valgrind.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-valgrind-overview.html
     \page creator-analyzer.html
     \nextpage creator-cache-profiler.html
@@ -140,7 +139,6 @@
 */
 
 /*!
-    \contentspage index.html
     \previouspage creator-analyzer.html
     \page creator-cache-profiler.html
     \nextpage creator-running-valgrind-remotely.html
@@ -271,7 +269,6 @@
 */
 
 /*!
-    \contentspage index.html
     \previouspage creator-cache-profiler.html
     \page creator-running-valgrind-remotely.html
     \nextpage creator-clang-tools.html
diff --git a/doc/qtcreator/src/android/androiddev.qdoc b/doc/qtcreator/src/android/androiddev.qdoc
index e2095df83c..950fe6e9aa 100644
--- a/doc/qtcreator/src/android/androiddev.qdoc
+++ b/doc/qtcreator/src/android/androiddev.qdoc
@@ -24,8 +24,6 @@
 ****************************************************************************/
 
     /*!
-
-    \contentspage index.html
     \page creator-developing-android.html
     \previouspage creator-connecting-mobile.html
     \if defined(qtdesignstudio)
diff --git a/doc/qtcreator/src/android/deploying-android.qdoc b/doc/qtcreator/src/android/deploying-android.qdoc
index c4ece06216..0e00224c64 100644
--- a/doc/qtcreator/src/android/deploying-android.qdoc
+++ b/doc/qtcreator/src/android/deploying-android.qdoc
@@ -24,8 +24,6 @@
 ****************************************************************************/
 
     /*!
-
-    \contentspage index.html
     \previouspage creator-deployment.html
     \page creator-deploying-android.html
     \nextpage creator-deployment-embedded-linux.html
diff --git a/doc/qtcreator/src/baremetal/creator-baremetal-dev.qdoc b/doc/qtcreator/src/baremetal/creator-baremetal-dev.qdoc
index d3ac93f133..3382cfa1d6 100644
--- a/doc/qtcreator/src/baremetal/creator-baremetal-dev.qdoc
+++ b/doc/qtcreator/src/baremetal/creator-baremetal-dev.qdoc
@@ -24,8 +24,6 @@
 ****************************************************************************/
 
     /*!
-
-    \contentspage index.html
     \previouspage creator-developing-android.html
     \page creator-developing-baremetal.html
     \nextpage creator-developing-generic-linux.html
diff --git a/doc/qtcreator/src/cmake/creator-projects-cmake.qdoc b/doc/qtcreator/src/cmake/creator-projects-cmake.qdoc
index af8c130105..e5f61c7caf 100644
--- a/doc/qtcreator/src/cmake/creator-projects-cmake.qdoc
+++ b/doc/qtcreator/src/cmake/creator-projects-cmake.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-project-other.html
     \page creator-project-cmake.html
     \nextpage creator-project-qbs.html
diff --git a/doc/qtcreator/src/debugger/creator-only/creator-debugger-example.qdoc b/doc/qtcreator/src/debugger/creator-only/creator-debugger-example.qdoc
index 9b8a6b5262..7efb6bd0e6 100644
--- a/doc/qtcreator/src/debugger/creator-only/creator-debugger-example.qdoc
+++ b/doc/qtcreator/src/debugger/creator-only/creator-debugger-example.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-debugging-qml.html
     \page creator-debugging-example.html
     \nextpage creator-qml-debugging-example.html
diff --git a/doc/qtcreator/src/debugger/creator-only/creator-debugger-setup.qdoc b/doc/qtcreator/src/debugger/creator-only/creator-debugger-setup.qdoc
index 379e821eb5..52270709ed 100644
--- a/doc/qtcreator/src/debugger/creator-only/creator-debugger-setup.qdoc
+++ b/doc/qtcreator/src/debugger/creator-only/creator-debugger-setup.qdoc
@@ -31,7 +31,6 @@
 
 
 /*!
-    \contentspage index.html
     \previouspage creator-debugging.html
     \page creator-debugger-engines.html
     \nextpage creator-debugger-operating-modes.html
diff --git a/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc b/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc
index 3df294cfdb..fdcec02bbc 100644
--- a/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc
+++ b/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-testing.html
     \page creator-debugging.html
     \nextpage creator-debugger-engines.html
@@ -98,7 +97,6 @@
 
 
 /*!
-    \contentspage index.html
     \previouspage creator-debugger-engines.html
     \page creator-debugger-operating-modes.html
     \nextpage creator-debug-mode.html
@@ -550,7 +548,6 @@
 
 
 /*!
-    \contentspage index.html
     \page creator-debug-mode.html
     \if defined(qtdesignstudio)
     \previouspage studio-debugging.html
@@ -837,7 +834,6 @@
 
 
 /*!
-    \contentspage index.html
     \previouspage creator-debug-mode.html
     \page creator-debugging-helpers.html
     \nextpage creator-debugging-qml.html
@@ -1435,7 +1431,6 @@
 
 
 /*!
-    \contentspage index.html
     \previouspage creator-qml-debugging-example.html
     \page creator-troubleshooting-debugging.html
     \nextpage creator-analyze-mode.html
diff --git a/doc/qtcreator/src/debugger/qtquick-debugger-example.qdoc b/doc/qtcreator/src/debugger/qtquick-debugger-example.qdoc
index b07c8eb575..24ab6934eb 100644
--- a/doc/qtcreator/src/debugger/qtquick-debugger-example.qdoc
+++ b/doc/qtcreator/src/debugger/qtquick-debugger-example.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \page creator-qml-debugging-example.html
     \if defined(qtdesignstudio)
     \previouspage creator-debugging-qml.html
diff --git a/doc/qtcreator/src/debugger/qtquick-debugging.qdoc b/doc/qtcreator/src/debugger/qtquick-debugging.qdoc
index f646e752c9..98978259ac 100644
--- a/doc/qtcreator/src/debugger/qtquick-debugging.qdoc
+++ b/doc/qtcreator/src/debugger/qtquick-debugging.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \page creator-debugging-qml.html
     \if defined(qtdesignstudio)
     \previouspage studio-debugging.html
diff --git a/doc/qtcreator/src/editors/creator-code-completion.qdoc b/doc/qtcreator/src/editors/creator-code-completion.qdoc
index 7a946d3325..c21ebef7b3 100644
--- a/doc/qtcreator/src/editors/creator-code-completion.qdoc
+++ b/doc/qtcreator/src/editors/creator-code-completion.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \previouspage creator-checking-code-syntax.html
     \page creator-completing-code.html
     \nextpage creator-indenting-code.html
diff --git a/doc/qtcreator/src/editors/creator-code-indentation.qdoc b/doc/qtcreator/src/editors/creator-code-indentation.qdoc
index c1427f460a..841f5c5b77 100644
--- a/doc/qtcreator/src/editors/creator-code-indentation.qdoc
+++ b/doc/qtcreator/src/editors/creator-code-indentation.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \previouspage creator-completing-code.html
     \page creator-indenting-code.html
     \nextpage qt-quick-toolbars.html
diff --git a/doc/qtcreator/src/editors/creator-code-refactoring.qdoc b/doc/qtcreator/src/editors/creator-code-refactoring.qdoc
index f333c92bc4..cd1177b427 100644
--- a/doc/qtcreator/src/editors/creator-code-refactoring.qdoc
+++ b/doc/qtcreator/src/editors/creator-code-refactoring.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \page creator-editor-refactoring.html
     \previouspage creator-editor-locator.html
     \if defined(qtdesignstudio)
diff --git a/doc/qtcreator/src/editors/creator-code-syntax.qdoc b/doc/qtcreator/src/editors/creator-code-syntax.qdoc
index 4d05f3f288..8da38dd3bf 100644
--- a/doc/qtcreator/src/editors/creator-code-syntax.qdoc
+++ b/doc/qtcreator/src/editors/creator-code-syntax.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \previouspage creator-highlighting.html
     \page creator-checking-code-syntax.html
     \nextpage creator-completing-code.html
diff --git a/doc/qtcreator/src/editors/creator-coding-edit-mode.qdoc b/doc/qtcreator/src/editors/creator-coding-edit-mode.qdoc
index c470d183be..315f19da93 100644
--- a/doc/qtcreator/src/editors/creator-coding-edit-mode.qdoc
+++ b/doc/qtcreator/src/editors/creator-coding-edit-mode.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-editor-functions.html
     \page creator-coding-navigating.html
     \nextpage creator-highlighting.html
diff --git a/doc/qtcreator/src/editors/creator-coding.qdoc b/doc/qtcreator/src/editors/creator-coding.qdoc
index 11990f4618..5250c351b6 100644
--- a/doc/qtcreator/src/editors/creator-coding.qdoc
+++ b/doc/qtcreator/src/editors/creator-coding.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \page creator-coding.html
     \if defined(qtdesignstudio)
     \previouspage creator-keyboard-shortcuts.html
diff --git a/doc/qtcreator/src/editors/creator-diff-editor.qdoc b/doc/qtcreator/src/editors/creator-diff-editor.qdoc
index 11608e0ce5..ca73e3b0f0 100644
--- a/doc/qtcreator/src/editors/creator-diff-editor.qdoc
+++ b/doc/qtcreator/src/editors/creator-diff-editor.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \page creator-diff-editor.html
     \if defined(qtdesignstudio)
     \previouspage qt-quick-toolbars.html
diff --git a/doc/qtcreator/src/editors/creator-editors-options-text.qdoc b/doc/qtcreator/src/editors/creator-editors-options-text.qdoc
index 41a394b3d1..24660d3cee 100644
--- a/doc/qtcreator/src/editors/creator-editors-options-text.qdoc
+++ b/doc/qtcreator/src/editors/creator-editors-options-text.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \page creator-editor-options-text.html
     \previouspage creator-editor-options.html
     \if defined(qtdesignstudio)
diff --git a/doc/qtcreator/src/editors/creator-editors-options.qdoc b/doc/qtcreator/src/editors/creator-editors-options.qdoc
index c5d8bf534f..317fe2dbcd 100644
--- a/doc/qtcreator/src/editors/creator-editors-options.qdoc
+++ b/doc/qtcreator/src/editors/creator-editors-options.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \page creator-editor-options.html
     \if defined(qtdesignstudio)
     \previouspage creator-editor-refactoring.html
diff --git a/doc/qtcreator/src/editors/creator-editors-writing-code.qdoc b/doc/qtcreator/src/editors/creator-editors-writing-code.qdoc
index fa87b7ebb9..3bb5f5832e 100644
--- a/doc/qtcreator/src/editors/creator-editors-writing-code.qdoc
+++ b/doc/qtcreator/src/editors/creator-editors-writing-code.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-coding.html
     \page creator-editor-functions.html
     \nextpage creator-coding-navigating.html
diff --git a/doc/qtcreator/src/editors/creator-finding.qdoc b/doc/qtcreator/src/editors/creator-finding.qdoc
index c9a4c371b7..53477ed1de 100644
--- a/doc/qtcreator/src/editors/creator-finding.qdoc
+++ b/doc/qtcreator/src/editors/creator-finding.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \page creator-finding-overview.html
     \if defined(qtdesignstudio)
     \previouspage creator-diff-editor.html
diff --git a/doc/qtcreator/src/editors/creator-locator.qdoc b/doc/qtcreator/src/editors/creator-locator.qdoc
index 951e61f490..73b0ecbe90 100644
--- a/doc/qtcreator/src/editors/creator-locator.qdoc
+++ b/doc/qtcreator/src/editors/creator-locator.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \previouspage creator-editor-finding.html
     \page creator-editor-locator.html
     \nextpage creator-editor-refactoring.html
diff --git a/doc/qtcreator/src/editors/creator-only/creator-beautifier.qdoc b/doc/qtcreator/src/editors/creator-only/creator-beautifier.qdoc
index e945cea424..11727cb091 100644
--- a/doc/qtcreator/src/editors/creator-only/creator-beautifier.qdoc
+++ b/doc/qtcreator/src/editors/creator-only/creator-beautifier.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-editor-refactoring.html
     \page creator-beautifier.html
     \nextpage creator-editor-options.html
diff --git a/doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc b/doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc
index 1b7b36baf8..3a6b40c486 100644
--- a/doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc
+++ b/doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-diff-editor.html
     \page creator-clang-codemodel.html
     \nextpage creator-finding-overview.html
diff --git a/doc/qtcreator/src/editors/creator-only/creator-code-pasting.qdoc b/doc/qtcreator/src/editors/creator-only/creator-code-pasting.qdoc
index b518c8ca3f..5fbc28c832 100644
--- a/doc/qtcreator/src/editors/creator-only/creator-code-pasting.qdoc
+++ b/doc/qtcreator/src/editors/creator-only/creator-code-pasting.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \previouspage qt-quick-toolbars.html
     \page creator-editor-codepasting.html
     \nextpage creator-macros.html
diff --git a/doc/qtcreator/src/editors/creator-only/creator-fakevim.qdoc b/doc/qtcreator/src/editors/creator-only/creator-fakevim.qdoc
index 09e7323e45..6e14ef2fd6 100644
--- a/doc/qtcreator/src/editors/creator-only/creator-fakevim.qdoc
+++ b/doc/qtcreator/src/editors/creator-only/creator-fakevim.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \previouspage creator-editor-options-text.html
     \page creator-editor-fakevim.html
     \nextpage creator-language-servers.html
diff --git a/doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc b/doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc
index b6c09ff1f4..ea8ecdc472 100644
--- a/doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc
+++ b/doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \previouspage creator-editor-fakevim.html
     \page creator-language-servers.html
     \nextpage creator-mime-types.html
diff --git a/doc/qtcreator/src/editors/creator-only/creator-mime-types.qdoc b/doc/qtcreator/src/editors/creator-only/creator-mime-types.qdoc
index 1f5e6bb175..ee04620d42 100644
--- a/doc/qtcreator/src/editors/creator-only/creator-mime-types.qdoc
+++ b/doc/qtcreator/src/editors/creator-only/creator-mime-types.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-language-servers.html
     \page creator-mime-types.html
     \nextpage creator-modeling.html
diff --git a/doc/qtcreator/src/editors/creator-only/creator-modeling.qdoc b/doc/qtcreator/src/editors/creator-only/creator-modeling.qdoc
index 9b5dc4e165..10e40c2849 100644
--- a/doc/qtcreator/src/editors/creator-only/creator-modeling.qdoc
+++ b/doc/qtcreator/src/editors/creator-only/creator-modeling.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-mime-types.html
     \page creator-modeling.html
     \nextpage creator-scxml.html
diff --git a/doc/qtcreator/src/editors/creator-only/creator-scxml.qdoc b/doc/qtcreator/src/editors/creator-only/creator-scxml.qdoc
index 403eeb5278..a8eee8965c 100644
--- a/doc/qtcreator/src/editors/creator-only/creator-scxml.qdoc
+++ b/doc/qtcreator/src/editors/creator-only/creator-scxml.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-modeling.html
     \page creator-scxml.html
     \nextpage creator-building-running.html
diff --git a/doc/qtcreator/src/editors/creator-only/creator-text-editing-macros.qdoc b/doc/qtcreator/src/editors/creator-only/creator-text-editing-macros.qdoc
index dba49c516c..99f5f00e37 100644
--- a/doc/qtcreator/src/editors/creator-only/creator-text-editing-macros.qdoc
+++ b/doc/qtcreator/src/editors/creator-only/creator-text-editing-macros.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \previouspage creator-editor-codepasting.html
     \page creator-macros.html
     \nextpage creator-diff-editor.html
diff --git a/doc/qtcreator/src/editors/creator-search.qdoc b/doc/qtcreator/src/editors/creator-search.qdoc
index a480b79c95..8c79e59700 100644
--- a/doc/qtcreator/src/editors/creator-search.qdoc
+++ b/doc/qtcreator/src/editors/creator-search.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \previouspage creator-finding-overview.html
     \page creator-editor-finding.html
     \nextpage creator-editor-locator.html
diff --git a/doc/qtcreator/src/editors/creator-semantic-highlighting.qdoc b/doc/qtcreator/src/editors/creator-semantic-highlighting.qdoc
index ae6cb6a653..728936dec2 100644
--- a/doc/qtcreator/src/editors/creator-semantic-highlighting.qdoc
+++ b/doc/qtcreator/src/editors/creator-semantic-highlighting.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \previouspage creator-coding-navigating.html
     \page creator-highlighting.html
     \nextpage creator-checking-code-syntax.html
diff --git a/doc/qtcreator/src/howto/creator-external-tools.qdoc b/doc/qtcreator/src/howto/creator-external-tools.qdoc
index 84e4985101..c06ef08d7f 100644
--- 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
diff --git a/doc/qtcreator/src/howto/creator-help.qdoc b/doc/qtcreator/src/howto/creator-help.qdoc
index 1b2e7f48f1..90e007ceeb 100644
--- 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}
diff --git a/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc b/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc
index 661d8495ba..03f697695d 100644
--- 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
diff --git a/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc b/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc
index caac21df75..3c7703a866 100644
--- 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
diff --git a/doc/qtcreator/src/howto/creator-only/creator-cli.qdoc b/doc/qtcreator/src/howto/creator-only/creator-cli.qdoc
index 16b453e74c..3ec803df2f 100644
--- 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
diff --git a/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc b/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc
index b96d23be87..f51b91006d 100644
--- 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
diff --git a/doc/qtcreator/src/howto/creator-only/creator-sessions.qdoc b/doc/qtcreator/src/howto/creator-only/creator-sessions.qdoc
index 0c939f5d27..e2c3816f86 100644
--- 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
diff --git a/doc/qtcreator/src/howto/creator-only/creator-task-lists.qdoc b/doc/qtcreator/src/howto/creator-only/creator-task-lists.qdoc
index 9ef66cc688..cc61374e7c 100644
--- 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
diff --git a/doc/qtcreator/src/howto/creator-only/creator-telemetry.qdoc b/doc/qtcreator/src/howto/creator-only/creator-telemetry.qdoc
index a9cc4359d1..de1a9d6679 100644
--- 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
diff --git a/doc/qtcreator/src/howto/creator-only/qtcreator-faq.qdoc b/doc/qtcreator/src/howto/creator-only/qtcreator-faq.qdoc
index 7aac8fc0a9..4035cda3d0 100644
--- 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
diff --git a/doc/qtcreator/src/howto/creator-sidebars.qdoc b/doc/qtcreator/src/howto/creator-sidebars.qdoc
index 6cc9feebc4..9ef27ef147 100644
--- 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
diff --git a/doc/qtcreator/src/howto/creator-ui.qdoc b/doc/qtcreator/src/howto/creator-ui.qdoc
index 543c140560..2f5dc4f274 100644
--- 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)
diff --git a/doc/qtcreator/src/howto/creator-views.qdoc b/doc/qtcreator/src/howto/creator-views.qdoc
index fe7c8254f3..1b37513fbd 100644
--- 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
diff --git a/doc/qtcreator/src/howto/creator-workspaces.qdoc b/doc/qtcreator/src/howto/creator-workspaces.qdoc
index 49dfa82a37..7696c481ca 100644
--- 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
diff --git a/doc/qtcreator/src/ios/creator-ios-dev.qdoc b/doc/qtcreator/src/ios/creator-ios-dev.qdoc
index 633d027521..c2eb07f9ae 100644
--- a/doc/qtcreator/src/ios/creator-ios-dev.qdoc
+++ b/doc/qtcreator/src/ios/creator-ios-dev.qdoc
@@ -24,8 +24,6 @@
 ****************************************************************************/
 
     /*!
-
-    \contentspage index.html
     \previouspage creator-developing-generic-linux.html
     \page creator-developing-ios.html
     \nextpage creator-developing-mcu.html
diff --git a/doc/qtcreator/src/linux-mobile/creator-deployment-embedded-linux.qdoc b/doc/qtcreator/src/linux-mobile/creator-deployment-embedded-linux.qdoc
index 6d2ad9c2e1..7eeb4f6820 100644
--- a/doc/qtcreator/src/linux-mobile/creator-deployment-embedded-linux.qdoc
+++ b/doc/qtcreator/src/linux-mobile/creator-deployment-embedded-linux.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \page creator-deployment-embedded-linux.html
     \previouspage creator-deploying-android.html
     \if defined(qtdesignstudio)
diff --git a/doc/qtcreator/src/linux-mobile/linuxdev.qdoc b/doc/qtcreator/src/linux-mobile/linuxdev.qdoc
index eefce112f1..da7e6cca08 100644
--- a/doc/qtcreator/src/linux-mobile/linuxdev.qdoc
+++ b/doc/qtcreator/src/linux-mobile/linuxdev.qdoc
@@ -24,8 +24,6 @@
 ****************************************************************************/
 
     /*!
-
-    \contentspage index.html
     \page creator-developing-generic-linux.html
     \if defined(qtdesignstudio)
     \previouspage creator-developing-android.html
diff --git a/doc/qtcreator/src/mcu/creator-mcu-dev.qdoc b/doc/qtcreator/src/mcu/creator-mcu-dev.qdoc
index 69f7dd8aa6..00295d0134 100644
--- a/doc/qtcreator/src/mcu/creator-mcu-dev.qdoc
+++ b/doc/qtcreator/src/mcu/creator-mcu-dev.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \previouspage creator-developing-ios.html
     \page creator-developing-mcu.html
     \nextpage creator-developing-qnx.html
diff --git a/doc/qtcreator/src/overview/creator-acknowledgements.qdoc b/doc/qtcreator/src/overview/creator-acknowledgements.qdoc
index 0ed535bb41..bdd45fd189 100644
--- a/doc/qtcreator/src/overview/creator-acknowledgements.qdoc
+++ b/doc/qtcreator/src/overview/creator-acknowledgements.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \page creator-acknowledgements.html
     \if defined(qtdesignstudio)
     \previouspage studio-terms.html
diff --git a/doc/qtcreator/src/overview/creator-only/creator-advanced.qdoc b/doc/qtcreator/src/overview/creator-only/creator-advanced.qdoc
index e31f6199ff..362425971a 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-advanced.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-advanced.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-autotest.html
     \page creator-advanced.html
     \nextpage creator-os-supported-platforms.html
diff --git a/doc/qtcreator/src/overview/creator-only/creator-commercial-overview.qdoc b/doc/qtcreator/src/overview/creator-only/creator-commercial-overview.qdoc
index 3b5380b950..a227fe0d19 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-commercial-overview.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-commercial-overview.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \page creator-commercial-overview.html
 
     \title Commercial Features
diff --git a/doc/qtcreator/src/overview/creator-only/creator-configuring.qdoc b/doc/qtcreator/src/overview/creator-only/creator-configuring.qdoc
index 3cb1f5709a..0c07923b8a 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-configuring.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-configuring.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-output-panes.html
     \page creator-configuring.html
     \nextpage creator-build-example-application.html
diff --git a/doc/qtcreator/src/overview/creator-only/creator-deployment-overview.qdoc b/doc/qtcreator/src/overview/creator-only/creator-deployment-overview.qdoc
index a8216d313e..21903f7ad5 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-deployment-overview.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-deployment-overview.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-running-targets.html
     \page creator-deployment.html
     \nextpage creator-deploying-android.html
diff --git a/doc/qtcreator/src/overview/creator-only/creator-design-overview.qdoc b/doc/qtcreator/src/overview/creator-only/creator-design-overview.qdoc
index 9b2537a356..456df09ff7 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-design-overview.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-design-overview.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-project-managing-sessions.html
     \page creator-design-mode.html
     \nextpage creator-visual-editor.html
diff --git a/doc/qtcreator/src/overview/creator-only/creator-getting-started.qdoc b/doc/qtcreator/src/overview/creator-only/creator-getting-started.qdoc
index 1407cf3358..627bd49595 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-getting-started.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-getting-started.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage index.html
     \page creator-getting-started.html
     \nextpage creator-overview.html
diff --git a/doc/qtcreator/src/overview/creator-only/creator-glossary.qdoc b/doc/qtcreator/src/overview/creator-only/creator-glossary.qdoc
index 5ddee7b0b0..03e862e294 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-glossary.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-glossary.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-known-issues.html
     \page creator-glossary.html
     \nextpage technical-support.html
diff --git a/doc/qtcreator/src/overview/creator-only/creator-help-overview.qdoc b/doc/qtcreator/src/overview/creator-only/creator-help-overview.qdoc
index 8798219a01..5ce2e861b0 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-help-overview.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-help-overview.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \page creator-help-overview.html
     \previouspage creator-telemetry.html
     \nextpage creator-help.html
diff --git a/doc/qtcreator/src/overview/creator-only/creator-issues.qdoc b/doc/qtcreator/src/overview/creator-only/creator-issues.qdoc
index 453718b219..578a289219 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-issues.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-issues.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-how-tos.html
     \page creator-known-issues.html
     \nextpage creator-glossary.html
diff --git a/doc/qtcreator/src/overview/creator-only/creator-mobile-targets.qdoc b/doc/qtcreator/src/overview/creator-only/creator-mobile-targets.qdoc
index 470d5c2360..97daacfd62 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-mobile-targets.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-mobile-targets.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \page creator-connecting-mobile.html
     \previouspage creator-deployment-qnx.html
     \nextpage creator-developing-android.html
diff --git a/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc b/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc
index 4210894cdf..1ba098e4ee 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-getting-started.html
     \page creator-overview.html
     \nextpage creator-quick-tour.html
diff --git a/doc/qtcreator/src/overview/creator-only/creator-supported-platforms.qdoc b/doc/qtcreator/src/overview/creator-only/creator-supported-platforms.qdoc
index f98d17a503..7013ee6cea 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-supported-platforms.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-supported-platforms.qdoc
@@ -31,7 +31,6 @@
 
 
 /*!
-    \contentspage index.html
     \previouspage creator-advanced.html
     \page creator-os-supported-platforms.html
     \nextpage creator-project-other.html
diff --git a/doc/qtcreator/src/overview/creator-only/creator-tech-support.qdoc b/doc/qtcreator/src/overview/creator-only/creator-tech-support.qdoc
index f851b19e8c..fb06269199 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-tech-support.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-tech-support.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-glossary.html
     \page technical-support.html
     \nextpage creator-acknowledgements.html
diff --git a/doc/qtcreator/src/overview/creator-only/creator-testing.qdoc b/doc/qtcreator/src/overview/creator-only/creator-testing.qdoc
index 10df1d7f31..c446fb82f7 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-testing.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-testing.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-build-process-customizing.html
     \page creator-testing.html
     \nextpage creator-debugging.html
diff --git a/doc/qtcreator/src/overview/creator-only/creator-tutorials.qdoc b/doc/qtcreator/src/overview/creator-only/creator-tutorials.qdoc
index ec2ba4fdf9..2e69569f68 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-tutorials.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-tutorials.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-build-example-application.html
     \page creator-tutorials.html
     \nextpage {Creating a Qt Quick Application}
diff --git a/doc/qtcreator/src/overview/creator-only/mobile-app-design.qdoc b/doc/qtcreator/src/overview/creator-only/mobile-app-design.qdoc
index b627c35a8d..9a4a9c94fd 100644
--- a/doc/qtcreator/src/overview/creator-only/mobile-app-design.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/mobile-app-design.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage adding-plugins.html
     \page creator-usability.html
     \nextpage creator-coding.html
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-autotools.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-autotools.qdoc
index 9dc854433b..5df4bbead7 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-autotools.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-autotools.qdoc
@@ -26,7 +26,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \previouspage creator-project-qbs.html
     \page creator-projects-autotools.html
     \nextpage creator-project-generic.html
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-build-run-tutorial.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-build-run-tutorial.qdoc
index 80e58ac0e4..c536c91cdd 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-build-run-tutorial.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-build-run-tutorial.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-configuring.html
     \page creator-build-example-application.html
     \nextpage creator-tutorials.html
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-building-running.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-building-running.qdoc
index 0e1c2c581a..d132bf4410 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-building-running.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-building-running.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-scxml.html
     \page creator-building-running.html
     \nextpage creator-live-preview.html
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-building.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-building.qdoc
index b1bb63a20c..29ab47eae9 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-building.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-building.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage qt-design-viewer.html
     \page creator-building-targets.html
     \nextpage creator-running-targets.html
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-builds-customizing.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-builds-customizing.qdoc
index 699e46d53b..f018020f54 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-builds-customizing.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-builds-customizing.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \page creator-build-process-customizing.html
     \if defined(qtdesignstudio)
     \previouspage creator-developing-generic-linux.html
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-compilers.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-compilers.qdoc
index 30d39dbffa..7d35025906 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-compilers.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-compilers.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-project-qmake.html
     \page creator-tool-chains.html
     \nextpage creator-debuggers.html
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc
index 32e9b7f704..0866481120 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-project-managing.html
     \page creator-project-creating.html
     \nextpage creator-project-opening.html
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards.qdoc
index 56a54a2660..6a919d5da2 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-project-qmake-libraries.html
     \page creator-project-wizards.html
     \nextpage creator-version-control.html
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-debuggers.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-debuggers.qdoc
index ebd1f6c366..3ef847e4b8 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-debuggers.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-debuggers.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-tool-chains.html
     \page creator-debuggers.html
     \nextpage creator-build-settings.html
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-generic.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-generic.qdoc
index 01056384a3..4a2c4c42ab 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-generic.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-generic.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-projects-autotools.html
     \page creator-project-generic.html
     \nextpage creator-project-nimble.html
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-libraries.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-libraries.qdoc
index 1a5248ca4e..6360edc893 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-libraries.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-libraries.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-project-opening.html
     \page creator-project-qmake-libraries.html
     \nextpage creator-project-wizards.html
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-nimble.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-nimble.qdoc
index 100edd0937..6df963bdf8 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-nimble.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-nimble.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \previouspage creator-project-generic.html
     \page creator-project-nimble.html
     \nextpage creator-cli.html
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-opening.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-opening.qdoc
index 60fb2c1644..929996dd98 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-opening.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-opening.qdoc
@@ -31,7 +31,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-project-creating.html
     \page creator-project-opening.html
     \nextpage creator-project-qmake-libraries.html
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-other.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-other.qdoc
index 0d02868d20..5ff6d1b637 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-other.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-other.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-os-supported-platforms.html
     \page creator-project-other.html
     \nextpage creator-project-cmake.html
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-overview.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-overview.qdoc
index 42adf40ed8..53a3f11667 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-overview.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-overview.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage accelbubble
     \page creator-project-managing.html
     \nextpage creator-project-creating.html
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-qbs.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-qbs.qdoc
index c17c147667..df44ceba5e 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-qbs.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-qbs.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \previouspage creator-project-cmake.html
     \page creator-project-qbs.html
     \nextpage creator-projects-autotools.html
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-qt-versions.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-qt-versions.qdoc
index db9f985bd9..0c171dc8ce 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-qt-versions.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-qt-versions.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-targets.html
     \page creator-project-qmake.html
     \nextpage creator-tool-chains.html
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build.qdoc
index c898b337ee..73c7c383e2 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-debuggers.html
     \page creator-build-settings.html
     \nextpage creator-run-settings.html
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-code-style.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-code-style.qdoc
index 2fd798458a..67d8859490 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-code-style.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-code-style.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-editor-settings.html
     \page creator-code-style-settings.html
     \nextpage creator-build-dependencies.html
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-dependencies.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-dependencies.qdoc
index 013987e5c7..e52f35ea4b 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-dependencies.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-dependencies.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \page creator-build-dependencies.html
     \previouspage creator-code-style-settings.html
     \if defined(qtdesignstudio)
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-editor.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-editor.qdoc
index 5f8d6c6fb1..2f5ea21a01 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-editor.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-editor.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-run-settings.html
     \page creator-editor-settings.html
     \nextpage creator-code-style-settings.html
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-environment.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-environment.qdoc
index f65d748565..89eb026500 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-environment.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-environment.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \previouspage creator-build-dependencies.html
     \page creator-project-settings-environment.html
     \nextpage creator-sharing-project-settings.html
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-overview.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-overview.qdoc
index 7b8386737c..eb0532f64e 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-overview.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-overview.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-vcs-subversion.html
     \page creator-configuring-projects.html
     \nextpage creator-targets.html
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run.qdoc
index e0d4182379..2591640a6d 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-build-settings.html
     \page creator-run-settings.html
     \nextpage creator-editor-settings.html
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-sharing.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-sharing.qdoc
index 84854aedd7..32f27d2bc2 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-sharing.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-sharing.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-project-settings-environment.html
     \page creator-sharing-project-settings.html
     \nextpage creator-project-managing-sessions.html
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-targets.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-targets.qdoc
index d8db38eba6..e31a3d568a 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-targets.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-targets.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-configuring-projects.html
     \page creator-targets.html
     \nextpage creator-project-qmake.html
diff --git a/doc/qtcreator/src/projects/creator-projects-running.qdoc b/doc/qtcreator/src/projects/creator-projects-running.qdoc
index b8cb227527..a7d6a27f9a 100644
--- a/doc/qtcreator/src/projects/creator-projects-running.qdoc
+++ b/doc/qtcreator/src/projects/creator-projects-running.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \page creator-running-targets.html
     \if defined(qtdesignstudio)
     \previouspage studio-live-preview.html
diff --git a/doc/qtcreator/src/qnx/creator-deployment-qnx.qdoc b/doc/qtcreator/src/qnx/creator-deployment-qnx.qdoc
index 2b266f877a..19e1217e63 100644
--- a/doc/qtcreator/src/qnx/creator-deployment-qnx.qdoc
+++ b/doc/qtcreator/src/qnx/creator-deployment-qnx.qdoc
@@ -34,7 +34,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-deployment-embedded-linux.html
     \page creator-deployment-qnx.html
     \nextpage creator-connecting-mobile.html
diff --git a/doc/qtcreator/src/qnx/creator-developing-qnx.qdoc b/doc/qtcreator/src/qnx/creator-developing-qnx.qdoc
index 8dce60438d..e535c04e04 100644
--- a/doc/qtcreator/src/qnx/creator-developing-qnx.qdoc
+++ b/doc/qtcreator/src/qnx/creator-developing-qnx.qdoc
@@ -29,7 +29,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \previouspage creator-developing-mcu.html
     \page creator-developing-qnx.html
     \nextpage creator-setup-webassembly.html
diff --git a/doc/qtcreator/src/qtcreator-toc.qdoc b/doc/qtcreator/src/qtcreator-toc.qdoc
index 5d20bc7c33..da35dae588 100644
--- a/doc/qtcreator/src/qtcreator-toc.qdoc
+++ b/doc/qtcreator/src/qtcreator-toc.qdoc
@@ -25,7 +25,6 @@
 
 
 /*!
-    \contentspage index.html
     \page qtcreator-toc.html
 
     \title All Topics
diff --git a/doc/qtcreator/src/qtcreator.qdoc b/doc/qtcreator/src/qtcreator.qdoc
index 46a55f1801..fe5e7f8175 100644
--- a/doc/qtcreator/src/qtcreator.qdoc
+++ b/doc/qtcreator/src/qtcreator.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage{index.html}{Qt Creator}
     \page index.html
     \nextpage creator-getting-started.html
 
diff --git a/doc/qtcreator/src/qtquick/creator-only/creator-mobile-app-tutorial.qdoc b/doc/qtcreator/src/qtquick/creator-only/creator-mobile-app-tutorial.qdoc
index 7769b7501c..62ad21e603 100644
--- a/doc/qtcreator/src/qtquick/creator-only/creator-mobile-app-tutorial.qdoc
+++ b/doc/qtcreator/src/qtquick/creator-only/creator-mobile-app-tutorial.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-writing-program.html
     \example accelbubble
     \nextpage creator-project-managing.html
diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-app-development.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-app-development.qdoc
index f416d1bfa2..30e78fe38a 100644
--- a/doc/qtcreator/src/qtquick/creator-only/qtquick-app-development.qdoc
+++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-app-development.qdoc
@@ -30,8 +30,6 @@
 // **********************************************************************
 
 /*!
-
-    \contentspage index.html
     \page creator-visual-editor.html
     \previouspage creator-design-mode.html
     \nextpage quick-projects.html
diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-app-tutorial.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-app-tutorial.qdoc
index f1574af001..03c406a0c1 100644
--- a/doc/qtcreator/src/qtquick/creator-only/qtquick-app-tutorial.qdoc
+++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-app-tutorial.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-tutorials.html
     \example transitions
     \nextpage creator-writing-program.html
diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-connection-editor-backend.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-connection-editor-backend.qdoc
index 5cd7b328f1..322957a589 100644
--- a/doc/qtcreator/src/qtquick/creator-only/qtquick-connection-editor-backend.qdoc
+++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-connection-editor-backend.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage {Qt Creator Manual}
     \previouspage quick-property-bindings.html
     \page quick-connections-backend.html
     \nextpage quick-states.html
diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc
index b11cfce952..4841ee2023 100644
--- a/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc
+++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc
@@ -30,8 +30,6 @@
 // **********************************************************************
 
 /*!
-
-    \contentspage index.html
     \previouspage creator-visual-editor.html
     \page quick-projects.html
     \nextpage creator-using-qt-quick-designer.html
diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-iso-icon-browser.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-iso-icon-browser.qdoc
index 4a9c57e9e6..6dd14ec3a7 100644
--- a/doc/qtcreator/src/qtquick/creator-only/qtquick-iso-icon-browser.qdoc
+++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-iso-icon-browser.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \page qtquick-iso-icon-browser.html
     \previouspage studio-3d-scene-environment.html
     \nextpage creator-qml-modules-with-plugins.html
diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-modules-with-plugins.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-modules-with-plugins.qdoc
index 709cadb3a8..c37643d7bb 100644
--- a/doc/qtcreator/src/qtquick/creator-only/qtquick-modules-with-plugins.qdoc
+++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-modules-with-plugins.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-quick-ui-forms.html
     \page creator-qml-modules-with-plugins.html
     \nextpage quick-converting-ui-projects.html
diff --git a/doc/qtcreator/src/qtquick/qt-design-viewer.qdoc b/doc/qtcreator/src/qtquick/qt-design-viewer.qdoc
index 044737bf74..0bd0f8a2e9 100644
--- a/doc/qtcreator/src/qtquick/qt-design-viewer.qdoc
+++ b/doc/qtcreator/src/qtquick/qt-design-viewer.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \previouspage creator-live-preview-devices.html
     \page qt-design-viewer.html
     \if defined(qtdesignstudio)
diff --git a/doc/qtcreator/src/qtquick/qtquick-adding-dynamics.qdoc b/doc/qtcreator/src/qtquick/qtquick-adding-dynamics.qdoc
index 9370ae848f..3c8d73aa45 100644
--- a/doc/qtcreator/src/qtquick/qtquick-adding-dynamics.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-adding-dynamics.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \page qtquick-adding-dynamics.html
     \previouspage creator-quick-ui-forms.html
     \nextpage studio-timeline.html
diff --git a/doc/qtcreator/src/qtquick/qtquick-annotations.qdoc b/doc/qtcreator/src/qtquick/qtquick-annotations.qdoc
index 0c982d6548..2a60ec74bf 100644
--- a/doc/qtcreator/src/qtquick/qtquick-annotations.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-annotations.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage {Qt Creator Manual}
     \page qtquick-annotations.html
     \previouspage qtquick-fonts.html
     \nextpage creator-quick-ui-forms.html
diff --git a/doc/qtcreator/src/qtquick/qtquick-buttons.qdoc b/doc/qtcreator/src/qtquick/qtquick-buttons.qdoc
index b9f4bf2ff6..54ad29ee8a 100644
--- a/doc/qtcreator/src/qtquick/qtquick-buttons.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-buttons.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage qtquick-form-editor.html
     \page quick-buttons.html
     \nextpage quick-scalable-image.html
@@ -118,8 +117,6 @@
 
 
 /*!
-
-    \contentspage index.html
     \previouspage quick-buttons.html
     \page quick-scalable-image.html
     \nextpage qtquick-navigator.html
diff --git a/doc/qtcreator/src/qtquick/qtquick-components.qdoc b/doc/qtcreator/src/qtquick/qtquick-components.qdoc
index 611dd97255..3820b01116 100644
--- a/doc/qtcreator/src/qtquick/qtquick-components.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-components.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \page quick-components.html
     \if defined(qtdesignstudio)
     \previouspage quick-uis.html
diff --git a/doc/qtcreator/src/qtquick/qtquick-connection-editor-bindings.qdoc b/doc/qtcreator/src/qtquick/qtquick-connection-editor-bindings.qdoc
index daee35732c..b8ecfaab9d 100644
--- a/doc/qtcreator/src/qtquick/qtquick-connection-editor-bindings.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-connection-editor-bindings.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage {Qt Creator Manual}
     \page quick-property-bindings.html
     \previouspage quick-dynamic-properties.html
     \if defined(qtdesignstudio)
diff --git a/doc/qtcreator/src/qtquick/qtquick-connection-editor-properties.qdoc b/doc/qtcreator/src/qtquick/qtquick-connection-editor-properties.qdoc
index 1473007a54..9c05d2524c 100644
--- a/doc/qtcreator/src/qtquick/qtquick-connection-editor-properties.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-connection-editor-properties.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \previouspage quick-signals.html
     \page quick-dynamic-properties.html
     \nextpage quick-property-bindings.html
diff --git a/doc/qtcreator/src/qtquick/qtquick-connection-editor-signals.qdoc b/doc/qtcreator/src/qtquick/qtquick-connection-editor-signals.qdoc
index a9e221ce73..2a64174185 100644
--- a/doc/qtcreator/src/qtquick/qtquick-connection-editor-signals.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-connection-editor-signals.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage {Qt Creator Manual}
     \previouspage qmldesigner-connections.html
     \page quick-signals.html
     \nextpage quick-dynamic-properties.html
diff --git a/doc/qtcreator/src/qtquick/qtquick-connection-editor.qdoc b/doc/qtcreator/src/qtquick/qtquick-connection-editor.qdoc
index d3cefb7699..5c8cba4870 100644
--- a/doc/qtcreator/src/qtquick/qtquick-connection-editor.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-connection-editor.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \previouspage studio-timeline.html
     \page qmldesigner-connections.html
     \nextpage quick-signals.html
diff --git a/doc/qtcreator/src/qtquick/qtquick-designer.qdoc b/doc/qtcreator/src/qtquick/qtquick-designer.qdoc
index e47d39dee4..ec1388ca33 100644
--- a/doc/qtcreator/src/qtquick/qtquick-designer.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-designer.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \page creator-using-qt-quick-designer.html
     \if defined(qtdesignstudio)
     \previouspage creator-modes.html
diff --git a/doc/qtcreator/src/qtquick/qtquick-fonts.qdoc b/doc/qtcreator/src/qtquick/qtquick-fonts.qdoc
index 081de12862..640e4372a0 100644
--- a/doc/qtcreator/src/qtquick/qtquick-fonts.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-fonts.qdoc
@@ -24,8 +24,6 @@
 ****************************************************************************/
 
 /*!
-
-    \contentspage index.html
     \previouspage qtquick-properties.html
     \page qtquick-fonts.html
     \nextpage qtquick-annotations.html
diff --git a/doc/qtcreator/src/qtquick/qtquick-form-editor.qdoc b/doc/qtcreator/src/qtquick/qtquick-form-editor.qdoc
index 37a31cc4be..3d963cf7dd 100644
--- a/doc/qtcreator/src/qtquick/qtquick-form-editor.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-form-editor.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \page qtquick-form-editor.html
     \previouspage quick-components.html
     \nextpage quick-buttons.html
@@ -34,6 +33,26 @@
     You design applications in the \uicontrol {Form Editor} by placing items
     into it.
 
+    \image qmldesigner-form-editor.png "Form Editor view"
+
+    \section1 Resizing Items
+
+    When you select items in the \uicontrol {Form Editor}, selection handles
+    appear around their edges and in their corners. You can drag the selection
+    handles to resize items.
+
+    \if defined(qtdesignstudio)
+    To have the resizing done from the center of the selected item instead from
+    its edges, press \key Alt.
+
+    To preserve the image aspect ratio while resizing when using the corner
+    handles, press \key Shift. This also works on items that are anchored
+    using left, right, top, or bottom anchors.
+
+    To both resize from the center of the item and preserve the aspect ratio,
+    press \key Alt+Shift.
+    \endif
+
     \section1 Snapping to Parent and Sibling Items
 
     When you are working on a design, you can use snapping to align
@@ -61,16 +80,6 @@
     To hide them, select the \inlineimage boundingrect.png
     button.
 
-    \section1 Selecting Items
-
-    When you point the mouse to overlapping items, the frontmost item is
-    selected by default. However, items that do not have any content, such as
-    the mouse area, are typically located in front of items that do have
-    content, such as rectangles or border images. To select items with content
-    by default, click the
-    \inlineimage qmldesigner-only-select-items-with-content.png
-    button.
-
     \section1 Previewing Component Size
 
     The width and height of the root item in a QML file determine the size of
@@ -89,6 +98,11 @@
 
     \image qmldesigner-preview-size.png "Canvas width and height"
 
+    To set the initial size of the root item, select \uicontrol Tools >
+    \uicontrol Options > \uicontrol {Qt Quick} > \uicontrol {\QMLD} and
+    specify the item width and height in the \uicontrol {Root Item Init Size}
+    group.
+
     \section1 Specifying Canvas Size
 
     To change the canvas size, select \uicontrol Tools > \uicontrol Options >
diff --git a/doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc b/doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc
index 1150e1339d..d76327ad35 100644
--- a/doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \page quick-converting-ui-projects.html
     \if defined(qtdesignstudio)
     \previouspage studio-importing-designs.html
diff --git a/doc/qtcreator/src/qtquick/qtquick-live-preview-desktop.qdoc b/doc/qtcreator/src/qtquick/qtquick-live-preview-desktop.qdoc
index ad6f61b4d0..42ebca507d 100644
--- a/doc/qtcreator/src/qtquick/qtquick-live-preview-desktop.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-live-preview-desktop.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \previouspage creator-live-preview.html
     \page creator-live-preview-desktop.html
     \nextpage creator-live-preview-devices.html
diff --git a/doc/qtcreator/src/qtquick/qtquick-live-preview-devices.qdoc b/doc/qtcreator/src/qtquick/qtquick-live-preview-devices.qdoc
index 38edb191dc..8cf7f9303f 100644
--- a/doc/qtcreator/src/qtquick/qtquick-live-preview-devices.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-live-preview-devices.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \previouspage creator-live-preview-desktop.html
     \page creator-live-preview-devices.html
     \nextpage qt-design-viewer.html
diff --git a/doc/qtcreator/src/qtquick/qtquick-live-preview.qdoc b/doc/qtcreator/src/qtquick/qtquick-live-preview.qdoc
index 48c03e8a55..6d1b2d8726 100644
--- a/doc/qtcreator/src/qtquick/qtquick-live-preview.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-live-preview.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \if defined(qtdesignstudio)
     \previouspage studio-3d-camera.html
     \else
diff --git a/doc/qtcreator/src/qtquick/qtquick-navigator.qdoc b/doc/qtcreator/src/qtquick/qtquick-navigator.qdoc
index 5ae3344d4f..43eb353ace 100644
--- a/doc/qtcreator/src/qtquick/qtquick-navigator.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-navigator.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage {Qt Creator Manual}
     \page qtquick-navigator.html
     \previouspage quick-scalable-image.html
     \nextpage qtquick-properties.html
@@ -39,44 +38,44 @@
 
     You can select items in the \uicontrol Navigator to edit their properties
     in the \uicontrol Properties view. Items can access the properties of their
-    parent item. To select items on the canvas, right-click an item, and select
-    another type in the context menu.
+    parent item. To select items in the \uicontrol {Form Editor}, right-click
+    an item, and select another type in the context menu.
 
-    Typically, child items are located within the parent item on the canvas.
-    However, they do not necessarily have to fit inside the parent item. For
-    example, you might want to make a mouse area larger than the rectangle
-    or image beneath it (1).
+    Typically, child items are located within the parent item in the
+    \uicontrol {Form Editor}. However, they do not necessarily have to
+    fit inside the parent item. For example, you might want to make a
+    mouse area larger than the rectangle or image beneath it (1).
 
     \image qmldesigner-element-size.png "Mouse area for a button"
 
     When you copy an item, all its child items are also copied. When
     you remove an item, the child items are also removed.
 
-    To show and hide items on the canvas when focusing on specific parts of the
-    application, click \inlineimage eye_open.png
-    . To change the visibility of an item in the application code, select the
+    Select context menu commands to reset item size, position, or anchors,
+    and to edit items colors or the annotations attached to it. To change
+    the source of an Image type, select \uicontrol {Change Source URL} in
+    the context menu.
+
+    \section1 Showing and Hiding Items
+
+    To show and hide items in the \uicontrol {Form Editor} when focusing on
+    specific parts of the application, click \inlineimage eye_open.png
+    in the \uicontrol Navigator.
+
+    To change the visibility of an item in the application code, select the
     \uicontrol Visibility check box in the \uicontrol Properties view or select
     \uicontrol Edit > \uicontrol Visibility in the context menu.
 
-    You can also set the \uicontrol Opacity field to 0 to hide items that you
-    want to apply animation to.
+    You can also set the \uicontrol Opacity field to 0 in \uicontrol Properties
+    to hide items in the UI that you want to apply animation to.
 
     As all properties, visibility and opacity are inherited from the parent
     item. To hide or show child items, edit the properties of the parent item.
 
-    To hide invisible items in the navigator, click \inlineimage filtericon.png
+    To hide invisible items in the \uicontrol Navigator, click
+    \inlineimage filtericon.png
     (\uicontrol {Filter Tree}) and select \uicontrol {Show only visible items}.
 
-    To reset item size, position, or anchors, select context menu commands. To
-    change the source of an Image type, select \uicontrol {Change Source URL} in
-    the context menu.
-
-    To view lists of files or projects, instead, select \uicontrol {File System},
-    \uicontrol {Open Documents}, or \uicontrol Projects in the menu. To view
-    several types of content at a time, split the sidebars by clicking the
-    \inlineimage splitbutton_horizontal.png
-    (\uicontrol Split) button.
-
     \section1 Setting the Stacking Order
 
     The \c z property of an \l Item determines its position in relation to its
@@ -86,7 +85,7 @@
     from the last item up.
 
     To move an item to the front or back of all its siblings, right-click it in
-    the navigator or the \uicontrol {Form Editor} and select
+    the \uicontrol Navigator or \uicontrol {Form Editor} and select
     \uicontrol {Stack (z)} > \uicontrol {To Front} or \uicontrol {To Back}.
     To raise or lower the stack value of an item, select \uicontrol Raise
     or \uicontrol Lower. To remove the \c z property, select
@@ -97,13 +96,14 @@
 
     \section1 Switching Parent Items
 
-    When you drag and drop instances of QML types to the canvas, the new item is
-    added as a child of the item beneath it. When you move items on the canvas,
-    it is not possible to determine whether you want to adjust their position or
-    attach them to a new parent item. Therefore, the parent item is not
-    automatically changed. To change the parent of the item, press down the
-    \key Shift key before you drag and drop the item into a new position. The
-    topmost item under the cursor becomes the new parent of the item.
+    When you drag and drop instances of QML types to the
+    \uicontrol {Form Editor}, the new item is added as a child of the item
+    beneath it. When you move the items, it is not possible to determine whether
+    you want to adjust their position or attach them to a new parent item.
+    Therefore, the parent item is not automatically changed. To change the
+    parent of the item, press down the \key Shift key before you drag and drop
+    the item into a new position. The topmost item under the cursor becomes the
+    new parent of the item.
 
     You can change the parent of an item also in the \uicontrol Navigator.
     Drag and drop the item to another position in the tree or use the arrow
diff --git a/doc/qtcreator/src/qtquick/qtquick-pathview-editor.qdoc b/doc/qtcreator/src/qtquick/qtquick-pathview-editor.qdoc
index a3e8f875c0..066afdde98 100644
--- a/doc/qtcreator/src/qtquick/qtquick-pathview-editor.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-pathview-editor.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \page qmldesigner-pathview-editor.html
     \previouspage quick-states.html
     \nextpage studio-3d.html
diff --git a/doc/qtcreator/src/qtquick/qtquick-profiler.qdoc b/doc/qtcreator/src/qtquick/qtquick-profiler.qdoc
index 1e126a35fd..3e0d228cb6 100644
--- a/doc/qtcreator/src/qtquick/qtquick-profiler.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-profiler.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \page creator-qml-performance-monitor.html
     \if defined(qtdesignstudio)
     \previouspage creator-qml-debugging-example.html
diff --git a/doc/qtcreator/src/qtquick/qtquick-properties.qdoc b/doc/qtcreator/src/qtquick/qtquick-properties.qdoc
index 95282b046e..cdba49811c 100644
--- a/doc/qtcreator/src/qtquick/qtquick-properties.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-properties.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \page qtquick-properties.html
     \previouspage qtquick-navigator.html
     \nextpage qtquick-fonts.html
diff --git a/doc/qtcreator/src/qtquick/qtquick-states.qdoc b/doc/qtcreator/src/qtquick/qtquick-states.qdoc
index 27c287bb58..d670fb21b5 100644
--- a/doc/qtcreator/src/qtquick/qtquick-states.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-states.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage {Qt Creator Manual}
     \page quick-states.html
     \if defined(qtdesignstudio)
     \previouspage quick-property-bindings.html
diff --git a/doc/qtcreator/src/qtquick/qtquick-timeline.qdoc b/doc/qtcreator/src/qtquick/qtquick-timeline.qdoc
index 1fae55bb9a..9fb9baa0c1 100644
--- a/doc/qtcreator/src/qtquick/qtquick-timeline.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-timeline.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage {Qt Design Studio Manual}
     \previouspage qtquick-adding-dynamics.html
     \page studio-timeline.html
     \nextpage qmldesigner-connections.html
diff --git a/doc/qtcreator/src/qtquick/qtquick-toolbars.qdoc b/doc/qtcreator/src/qtquick/qtquick-toolbars.qdoc
index 834bc605f7..be781e11dc 100644
--- a/doc/qtcreator/src/qtquick/qtquick-toolbars.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-toolbars.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-indenting-code.html
     \page qt-quick-toolbars.html
     \if defined(qtdesignstudio)
diff --git a/doc/qtcreator/src/qtquick/qtquick-ui-forms.qdoc b/doc/qtcreator/src/qtquick/qtquick-ui-forms.qdoc
index 14bb305be1..3d243c9571 100644
--- a/doc/qtcreator/src/qtquick/qtquick-ui-forms.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-ui-forms.qdoc
@@ -30,8 +30,6 @@
 // **********************************************************************
 
 /*!
-
-    \contentspage index.html
     \page creator-quick-ui-forms.html
     \previouspage qtquick-annotations.html
     \nextpage qtquick-adding-dynamics.html
diff --git a/doc/qtcreator/src/qtquick/qtquick-uis.qdoc b/doc/qtcreator/src/qtquick/qtquick-uis.qdoc
index 2200f8fae2..e681a32bc0 100644
--- a/doc/qtcreator/src/qtquick/qtquick-uis.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-uis.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \page quick-uis.html
     \if defined(qtdesignstudio)
     \previouspage quick-converting-ui-projects.html
diff --git a/doc/qtcreator/src/vcs/creator-only/creator-vcs-bazaar.qdoc b/doc/qtcreator/src/vcs/creator-only/creator-vcs-bazaar.qdoc
index 5142dc2686..420b1800c5 100644
--- a/doc/qtcreator/src/vcs/creator-only/creator-vcs-bazaar.qdoc
+++ b/doc/qtcreator/src/vcs/creator-only/creator-vcs-bazaar.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-version-control.html
     \page creator-vcs-bazaar.html
     \nextpage creator-vcs-clearcase.html
diff --git a/doc/qtcreator/src/vcs/creator-only/creator-vcs-clearcase.qdoc b/doc/qtcreator/src/vcs/creator-only/creator-vcs-clearcase.qdoc
index 7fea2ced5a..4518acc43e 100644
--- a/doc/qtcreator/src/vcs/creator-only/creator-vcs-clearcase.qdoc
+++ b/doc/qtcreator/src/vcs/creator-only/creator-vcs-clearcase.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-vcs-bazaar.html
     \page creator-vcs-clearcase.html
     \nextpage creator-vcs-cvs.html
diff --git a/doc/qtcreator/src/vcs/creator-only/creator-vcs-cvs.qdoc b/doc/qtcreator/src/vcs/creator-only/creator-vcs-cvs.qdoc
index 030fd73240..9db5e06cd2 100644
--- a/doc/qtcreator/src/vcs/creator-only/creator-vcs-cvs.qdoc
+++ b/doc/qtcreator/src/vcs/creator-only/creator-vcs-cvs.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-vcs-clearcase.html
     \page creator-vcs-cvs.html
     \nextpage creator-vcs-git.html
diff --git a/doc/qtcreator/src/vcs/creator-only/creator-vcs-mercurial.qdoc b/doc/qtcreator/src/vcs/creator-only/creator-vcs-mercurial.qdoc
index 9c0abaf98e..244cb995a8 100644
--- a/doc/qtcreator/src/vcs/creator-only/creator-vcs-mercurial.qdoc
+++ b/doc/qtcreator/src/vcs/creator-only/creator-vcs-mercurial.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-vcs-git.html
     \page creator-vcs-mercurial.html
     \nextpage creator-vcs-perforce.html
diff --git a/doc/qtcreator/src/vcs/creator-only/creator-vcs-perforce.qdoc b/doc/qtcreator/src/vcs/creator-only/creator-vcs-perforce.qdoc
index f84aef760d..8c59e3626d 100644
--- a/doc/qtcreator/src/vcs/creator-only/creator-vcs-perforce.qdoc
+++ b/doc/qtcreator/src/vcs/creator-only/creator-vcs-perforce.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-vcs-mercurial.html
     \page creator-vcs-perforce.html
     \nextpage creator-vcs-subversion.html
diff --git a/doc/qtcreator/src/vcs/creator-only/creator-vcs-subversion.qdoc b/doc/qtcreator/src/vcs/creator-only/creator-vcs-subversion.qdoc
index 900f5a3b6f..a84f645053 100644
--- a/doc/qtcreator/src/vcs/creator-only/creator-vcs-subversion.qdoc
+++ b/doc/qtcreator/src/vcs/creator-only/creator-vcs-subversion.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-vcs-perforce.html
     \page creator-vcs-subversion.html
     \nextpage creator-configuring-projects.html
diff --git a/doc/qtcreator/src/vcs/creator-only/creator-vcs.qdoc b/doc/qtcreator/src/vcs/creator-only/creator-vcs.qdoc
index 3dfc772b45..03e1c03c1e 100644
--- a/doc/qtcreator/src/vcs/creator-only/creator-vcs.qdoc
+++ b/doc/qtcreator/src/vcs/creator-only/creator-vcs.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-project-wizards.html
     \page creator-version-control.html
     \nextpage creator-vcs-bazaar.html
diff --git a/doc/qtcreator/src/vcs/creator-vcs-git.qdoc b/doc/qtcreator/src/vcs/creator-vcs-git.qdoc
index 732ba80597..b337215a79 100644
--- a/doc/qtcreator/src/vcs/creator-vcs-git.qdoc
+++ b/doc/qtcreator/src/vcs/creator-vcs-git.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \page creator-vcs-git.html
     \if defined(qtdesignstudio)
     \previouspage studio-projects.html
diff --git a/doc/qtcreator/src/webassembly/creator-webassembly.qdoc b/doc/qtcreator/src/webassembly/creator-webassembly.qdoc
index 6fa120ee96..811cb32d1e 100644
--- a/doc/qtcreator/src/webassembly/creator-webassembly.qdoc
+++ b/doc/qtcreator/src/webassembly/creator-webassembly.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
     /*!
-    \contentspage index.html
     \previouspage creator-developing-qnx.html
     \page creator-setup-webassembly.html
     \nextpage creator-build-process-customizing.html
diff --git a/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc b/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc
index ae76170d45..a28111f574 100644
--- a/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc
+++ b/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage {Creating a Qt Quick Application}
     \page creator-writing-program.html
     \nextpage {Creating a Mobile Application}
diff --git a/doc/qtcreator/src/widgets/qtdesigner-overview.qdoc b/doc/qtcreator/src/widgets/qtdesigner-overview.qdoc
index ba406bb8d9..915765c2b0 100644
--- a/doc/qtcreator/src/widgets/qtdesigner-overview.qdoc
+++ b/doc/qtcreator/src/widgets/qtdesigner-overview.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage quick-converting-ui-projects.html
     \page creator-using-qt-designer.html
     \nextpage adding-plugins.html
diff --git a/doc/qtcreator/src/widgets/qtdesigner-plugins.qdoc b/doc/qtcreator/src/widgets/qtdesigner-plugins.qdoc
index 1e43501b63..7c247d457e 100644
--- a/doc/qtcreator/src/widgets/qtdesigner-plugins.qdoc
+++ b/doc/qtcreator/src/widgets/qtdesigner-plugins.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************
 
 /*!
-    \contentspage index.html
     \previouspage creator-using-qt-designer.html
     \page adding-plugins.html
     \nextpage creator-usability.html
diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-overview.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-overview.qdoc
index d666763e55..1def2283b2 100644
--- a/doc/qtdesignstudio/src/qtbridge/qtbridge-overview.qdoc
+++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-overview.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage {Qt Design Studio Manual}
     \previouspage studio-getting-started.html
     \page qtbridge-overview.html
     \nextpage psqtbridge.html
diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-overview.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-overview.qdoc
index 272a045421..b4c5ec0267 100644
--- a/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-overview.qdoc
+++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-overview.qdoc
@@ -26,7 +26,6 @@
 // Note: The \page value is hard-coded as a link in Qt Bridge for Adobe Photoshop.
 
 /*!
-    \contentspage {Qt Design Studio Manual}
     \previouspage qtbridge-overview.html
     \page psqtbridge.html
     \nextpage qtbridge-ps-setup.html
diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-setup.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-setup.qdoc
index 6e3b8ef3cd..6af3a30274 100644
--- a/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-setup.qdoc
+++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-setup.qdoc
@@ -24,8 +24,6 @@
 ****************************************************************************/
 
 /*!
-
-    \contentspage index.html
     \previouspage psqtbridge.html
     \page qtbridge-ps-setup.html
     \nextpage qtbridge-ps-using.html
diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-using.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-using.qdoc
index 9ef4b1f949..fad3ccd8a1 100644
--- a/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-using.qdoc
+++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-using.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage {Qt Design Studio Manual}
     \previouspage qtbridge-ps-setup.html
     \page qtbridge-ps-using.html
     \nextpage sketchqtbridge.html
diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-overview.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-overview.qdoc
index dbb986aa61..a897ab044d 100644
--- a/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-overview.qdoc
+++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-overview.qdoc
@@ -26,7 +26,6 @@
 // Note: The \page value is hard-coded as a link in Qt Bridge for Sketch.
 
 /*!
-    \contentspage {Qt Design Studio Manual}
     \previouspage qtbridge-ps-using.html
     \page sketchqtbridge.html
     \nextpage qtbridge-sketch-setup.html
diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-setup.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-setup.qdoc
index 46d611ad51..793f59f574 100644
--- a/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-setup.qdoc
+++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-setup.qdoc
@@ -24,8 +24,6 @@
 ****************************************************************************/
 
 /*!
-
-    \contentspage index.html
     \previouspage sketchqtbridge.html
     \page qtbridge-sketch-setup.html
     \nextpage qtbridge-sketch-using.html
diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-using.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-using.qdoc
index bf937d64e2..7e52e05838 100644
--- a/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-using.qdoc
+++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-using.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage {Qt Design Studio Manual}
     \previouspage qtbridge-sketch-setup.html
     \page qtbridge-sketch-using.html
     \nextpage exporting-3d-assets.html
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-advanced.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-advanced.qdoc
index 1b4fc73284..afeb074ca7 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-advanced.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-advanced.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \previouspage qt-design-viewer.html
     \page studio-advanced.html
     \nextpage studio-platforms.html
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-debugging.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-debugging.qdoc
index 98687a88a7..d50c6153db 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-debugging.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-debugging.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage {Qt Design Studio Manual}
     \previouspage studio-javascript.html
     \page studio-debugging.html
     \nextpage creator-debugging-qml.html
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-examples.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-examples.qdoc
index 03e119d3c3..d1fa52b418 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-examples.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-examples.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage {Qt Design Studio Manual}
     \previouspage studio-help.html
     \group studioexamples
     \nextpage creator-help.html
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-faq.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-faq.qdoc
index 7667fa5a10..0cc58cf493 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-faq.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-faq.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \previouspage creator-help.html
     \page studio-faq.html
     \nextpage studio-terms.html
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-getting-started.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-getting-started.qdoc
index a9b12d1057..ff5a00f43a 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-getting-started.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-getting-started.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage {Qt Design Studio Manual}
     \previouspage index.html
     \page studio-getting-started.html
     \nextpage qtbridge-overview.html
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-help-overview.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-help-overview.qdoc
index 8c983839f2..19551df97f 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-help-overview.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-help-overview.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \page studio-help.html
     \previouspage creator-editor-external.html
     \nextpage {Examples and Tutorials}
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-importing-2d.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-importing-2d.qdoc
index b41485e83e..f551580505 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-importing-2d.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-importing-2d.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \previouspage studio-importing-designs.html
     \page studio-importing-2d.html
     \nextpage studio-importing-3d.html
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-importing-designs.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-importing-designs.qdoc
index 887a148e81..e681f69427 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-importing-designs.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-importing-designs.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \previouspage creator-vcs-git.html
     \page studio-importing-designs.html
     \nextpage studio-importing-2d.html
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-javascript.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-javascript.qdoc
index 4cb8a13d2b..43aed58d93 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-javascript.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-javascript.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \previouspage creator-editor-options-text.html
     \page studio-javascript.html
     \nextpage studio-debugging.html
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-platforms.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-platforms.qdoc
index 0e4e52a278..7332df5a3f 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-platforms.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-platforms.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \previouspage studio-advanced.html
     \page studio-platforms.html
     \nextpage creator-keyboard-shortcuts.html
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-projects-overview.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-projects-overview.qdoc
index 6f313d6688..c09078339f 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-projects-overview.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-projects-overview.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage {Qt Design Studio Manual}
     \previouspage {Tutorials}
     \page studio-projects-managing.html
     \nextpage studio-projects.html
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-projects.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-projects.qdoc
index 54ff29935f..f98f53349b 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-projects.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-projects.qdoc
@@ -24,8 +24,6 @@
 ****************************************************************************/
 
 /*!
-
-    \contentspage {Qt Design Studio Manual}
     \previouspage studio-projects-managing.html
     \page studio-projects.html
     \nextpage creator-vcs-git.html
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-terms.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-terms.qdoc
index 5bb5b2f2de..7c6ee4cf0d 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-terms.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-terms.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \page studio-terms.html
     \previouspage studio-faq.html
     \nextpage creator-acknowledgements.html
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc
index b5b7d372e0..eba0407984 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage index.html
     \page qtdesignstudio-toc.html
 
     \title All Topics
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-tutorials.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-tutorials.qdoc
index da98ee0690..f5c6d20ab8 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-tutorials.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-tutorials.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage {Qt Design Studio Manual}
     \previouspage creator-using-qt-quick-designer.html
     \group gstutorials
     \nextpage studio-projects-managing.html
diff --git a/doc/qtdesignstudio/src/qtdesignstudio.qdoc b/doc/qtdesignstudio/src/qtdesignstudio.qdoc
index 1a696084f4..979ba94e13 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage{index.html}{Qt Design Studio}
     \page index.html
     \nextpage studio-getting-started.html
 
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)
diff --git a/doc/qtdesignstudio/src/qtquickdesigner-components/qtquickdesigner-components.qdoc b/doc/qtdesignstudio/src/qtquickdesigner-components/qtquickdesigner-components.qdoc
index 82eef3cae7..da170cef0c 100644
--- a/doc/qtdesignstudio/src/qtquickdesigner-components/qtquickdesigner-components.qdoc
+++ b/doc/qtdesignstudio/src/qtquickdesigner-components/qtquickdesigner-components.qdoc
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 /*!
-    \contentspage {Qt Design Studio Manual}
     \page qtquickdesigner-components-overview.html
 
     \title Qt Quick Studio Components
diff --git a/qbs/imports/QtcProduct.qbs b/qbs/imports/QtcProduct.qbs
index 862c824743..d96c096f8f 100644
--- a/qbs/imports/QtcProduct.qbs
+++ b/qbs/imports/QtcProduct.qbs
@@ -37,6 +37,7 @@ Product {
     cpp.cxxFlags: {
         var flags = [];
         if (qbs.toolchain.contains("clang")
+                && !qbs.hostOS.contains("darwin")
                 && Utilities.versionCompare(cpp.compilerVersion, "10") >= 0) {
              // Triggers a lot in Qt.
             flags.push("-Wno-deprecated-copy", "-Wno-constant-logical-operand");
diff --git a/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs b/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs
index f44aa86af4..d3b2cafa1c 100644
--- a/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs
+++ b/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs
@@ -1,5 +1,5 @@
-import qbs
 import qbs.FileInfo
+import qbs.Utilities
 
 Module {
     Depends { name: "qtc" }
@@ -11,6 +11,12 @@ Module {
         cpp.cxxFlags: ["-Wno-deprecated-copy", "-Wno-init-list-lifetime"]
     }
 
+    Properties {
+        condition: qbs.toolchain.contains("clang") && !qbs.hostOS.contains("darwin")
+                   && Utilities.versionCompare(cpp.compilerVersion, "10") >= 0
+        cpp.cxxFlags: ["-Wno-deprecated-copy", "-Wno-constant-logical-operand"]
+    }
+
     priority: 1
 
     property bool enableUnitTests: false
diff --git a/share/qtcreator/debugger/dumper.py b/share/qtcreator/debugger/dumper.py
index ad8f495428..da8c322582 100644
--- a/share/qtcreator/debugger/dumper.py
+++ b/share/qtcreator/debugger/dumper.py
@@ -40,8 +40,8 @@ try:
     # that will never use this.
     import json
 except ModuleNotFoundError:
-    DumperBase.warn("Python module json not found. "
-                    "Native combined debugging might not work.")
+    print("Python module json not found. "
+          "Native combined debugging might not work.")
     pass
 
 
diff --git a/share/qtcreator/themes/design-dark.creatortheme b/share/qtcreator/themes/design-dark.creatortheme
deleted file mode 100644
index 914a717bdf..0000000000
--- a/share/qtcreator/themes/design-dark.creatortheme
+++ /dev/null
@@ -1,406 +0,0 @@
-[General]
-ThemeName=Design Dark
-PreferredStyles=Fusion
-DefaultTextEditorColorScheme=creator-dark.xml
-
-[Palette]
-shadowBackground=ff191919
-text=ffdadada
-textDisabled=60a4a6a8
-selectedBackgroundText=aa1f75cc
-toolBarItem=ffb3b3b3
-toolBarItemDisabled=ff686868
-fancyBarsNormalTextColor=ffd0d0d0
-fancyBarsBoldTextColor=b6fbfdff
-hoverBackground=ff404244
-selectedBackground=ff111111
-normalBackground=ff262728
-alternateBackground=ff353637
-error=ffdf4f4f
-warning=ffecbc1c
-splitter=ff474747
-textColorLink=ff007af4
-textColorLinkVisited=ffa57aff
-backgroundColorDisabled=ff444444
-
-
-
-
-[Colors]
-;DS controls theme START
-DScontrolBackground=ff242424
-DScontrolOutline=ff404040
-DStextColor=ffffffff
-DSdisabledTextColor=ff909090
-DSpanelBackground=ff2a2a2a
-DShoverHighlight=ff313131
-DScolumnBackground=ff363636
-DSfocusEdit=ff444444
-DSfocusDrag=ff565656
-DScontrolBackgroundPressed=ff606060
-DScontrolBackgroundChecked=ff565656
-DSinteraction=ff0492c9
-DSsliderActiveTrack=ff606060
-DSsliderInactiveTrack=ff404040
-DSsliderHandle=ff505050
-DSsliderActiveTrackHover=ff7f7f7f
-DSsliderInactiveTrackHover=ff505050
-DSsliderHandleHover=ff606060
-DSsliderActiveTrackFocus=ffaaaaaa
-DSsliderInactiveTrackFocus=ff606060
-DSsliderHandleFocus=ff0492c9
-DSerrorColor=ffdf3a3a
-DScontrolBackgroundDisabled=ff363636
-DScontrolOutlineDisabled=ff404040
-DStextColorDisabled=ff606060
-DStextSelectionColor=ff0492c9
-DStextSelectedTextColor=ffffffff
-DSscrollBarTrack=ff404040
-DSscrollBarHandle=ff505050
-DScontrolBackgroundInteraction=ff404040
-DStranslationIndicatorBorder=ff7f7f7f
-DSsectionHeadBackground=ff191919
-DSchangedStateText=ff99ccff
-;DS controls theme END
-
-BackgroundColorAlternate=alternateBackground
-BackgroundColorDark=shadowBackground
-BackgroundColorHover=hoverBackground
-BackgroundColorNormal=normalBackground
-BackgroundColorDisabled=backgroundColorDisabled
-BackgroundColorSelected=selectedBackground
-BadgeLabelBackgroundColorChecked=ffe0e0e0
-BadgeLabelBackgroundColorUnchecked=ff808080
-BadgeLabelTextColorChecked=ff606060
-BadgeLabelTextColorUnchecked=ffffffff
-CanceledSearchTextColor=ff0000
-ComboBoxArrowColor=toolBarItem
-ComboBoxArrowColorDisabled=toolBarItemDisabled
-ComboBoxTextColor=fancyBarsNormalTextColor
-DetailsButtonBackgroundColorHover=22ffffff
-DetailsWidgetBackgroundColor=18ffffff
-DockWidgetResizeHandleColor=splitter
-DoubleTabWidget1stSeparatorColor=splitter
-DoubleTabWidget1stTabActiveTextColor=text
-DoubleTabWidget1stTabBackgroundColor=ff505050
-DoubleTabWidget1stTabInactiveTextColor=text
-DoubleTabWidget2ndSeparatorColor=toolBarItemDisabled
-DoubleTabWidget2ndTabActiveTextColor=text
-DoubleTabWidget2ndTabBackgroundColor=selectedBackground
-DoubleTabWidget2ndTabInactiveTextColor=text
-EditorPlaceholderColor=normalBackground
-FancyToolBarSeparatorColor=toolBarItemDisabled
-FancyTabBarBackgroundColor=shadowBackground
-FancyTabBarSelectedBackgroundColor=ff000000
-FancyTabWidgetDisabledSelectedTextColor=toolBarItemDisabled
-FancyTabWidgetDisabledUnselectedTextColor=toolBarItemDisabled
-FancyTabWidgetEnabledSelectedTextColor=fancyBarsBoldTextColor
-FancyTabWidgetEnabledUnselectedTextColor=fancyBarsBoldTextColor
-FancyToolButtonHoverColor=hoverBackground
-FancyToolButtonSelectedColor=selectedBackground
-FutureProgressBackgroundColor=shadowBackground
-IconsBaseColor=toolBarItem
-IconsDisabledColor=toolBarItemDisabled
-IconsInfoColor=ff3099dc
-IconsInfoToolBarColor=ff71b2db
-IconsWarningColor=warning
-IconsWarningToolBarColor=fff2d76e
-IconsErrorColor=error
-IconsErrorToolBarColor=ffdb6f71
-IconsRunColor=ff6da838
-IconsRunToolBarColor=ff93be6c
-IconsStopColor=ffee6969
-IconsStopToolBarColor=ffe27f7f
-IconsInterruptColor=ff587ff7
-IconsInterruptToolBarColor=ff6a7bc3
-IconsDebugColor=toolBarItem
-IconsNavigationArrowsColor=ffebc322
-IconsBuildHammerHandleColor=ffb06112
-IconsBuildHammerHeadColor=ff828384
-IconsModeWelcomeActiveColor=ff1f6c97
-IconsModeEditActiveColor=ff99aaef
-IconsModeDesignActiveColor=ffbb6000
-IconsModeDebugActiveColor=ff99aaef
-IconsModeProjectActiveColor=ff1f6c97
-IconsModeAnalyzeActiveColor=ff43adee
-IconsModeHelpActiveColor=fff4be04
-IconsCodeModelKeywordColor=ff777777
-IconsCodeModelClassColor=ffc0b550
-IconsCodeModelStructColor=ff53b053
-IconsCodeModelFunctionColor=ffd34373
-IconsCodeModelVariableColor=ff2bbbcc
-IconsCodeModelEnumColor=ffc0b550
-IconsCodeModelMacroColor=ff476ba0
-IconsCodeModelAttributeColor=ff316511
-IconsCodeModelUniformColor=ff994899
-IconsCodeModelVaryingColor=ffa08833
-IconsCodeModelOverlayBackgroundColor=70000000
-IconsCodeModelOverlayForegroundColor=ffd0d0d0
-InfoBarBackground=ff505000
-InfoBarText=text
-MenuBarEmptyAreaBackgroundColor=shadowBackground
-MenuBarItemBackgroundColor=shadowBackground
-MenuBarItemTextColorDisabled=textDisabled
-MenuBarItemTextColorNormal=text
-MenuItemTextColorDisabled=textDisabled
-MenuItemTextColorNormal=text
-MiniProjectTargetSelectorBackgroundColor=shadowBackground
-MiniProjectTargetSelectorBorderColor=shadowBackground
-MiniProjectTargetSelectorSummaryBackgroundColor=shadowBackground
-MiniProjectTargetSelectorTextColor=fancyBarsNormalTextColor
-PanelStatusBarBackgroundColor=shadowBackground
-PanelsWidgetSeparatorLineColor=000000
-PanelTextColorDark=text
-PanelTextColorMid=ffa0a0a0
-PanelTextColorLight=text
-ProgressBarColorError=error
-ProgressBarColorFinished=dda4d576
-ProgressBarColorNormal=ff999999
-ProgressBarTitleColor=fancyBarsBoldTextColor
-ProgressBarBackgroundColor=a0606060
-SplitterColor=splitter
-TextColorDisabled=textDisabled
-TextColorError=ffff4040
-TextColorHighlight=ffff0000
-TextColorHighlightBackground=8a7f2c
-TextColorLink=textColorLink
-TextColorLinkVisited=textColorLinkVisited
-TextColorNormal=text
-ToggleButtonBackgroundColor=shadowBackground
-ToolBarBackgroundColor=shadowBackground
-TreeViewArrowColorNormal=hoverBackground
-TreeViewArrowColorSelected=text
-
-OutputPanes_DebugTextColor=text
-OutputPanes_ErrorMessageTextColor=ffff6c6c
-OutputPanes_MessageOutput=ff008787
-OutputPanes_NormalMessageTextColor=ff008787
-OutputPanes_StdErrTextColor=ffff6666
-OutputPanes_StdOutTextColor=text
-OutputPanes_WarningMessageTextColor=fff3c300
-OutputPanes_TestPassTextColor=ff00b400
-OutputPanes_TestFailTextColor=ffcf4848
-OutputPanes_TestXFailTextColor=ff28dc28
-OutputPanes_TestXPassTextColor=ffdc2828
-OutputPanes_TestSkipTextColor=ff828282
-OutputPanes_TestWarnTextColor=ffc8c800
-OutputPanes_TestFatalTextColor=ffc82828
-OutputPanes_TestDebugTextColor=ff329696
-OutputPaneButtonFlashColor=error
-OutputPaneToggleButtonTextColorChecked=fancyBarsNormalTextColor
-OutputPaneToggleButtonTextColorUnchecked=fancyBarsNormalTextColor
-
-Debugger_LogWindow_LogInput=ff00acac
-Debugger_LogWindow_LogStatus=ff00875a
-Debugger_LogWindow_LogTime=ffbf0303
-
-Debugger_WatchItem_ValueNormal=text
-Debugger_WatchItem_ValueInvalid=textDisabled
-Debugger_WatchItem_ValueChanged=ffff6666
-
-Debugger_Breakpoint_TextMarkColor=ffff4040
-
-Welcome_TextColor=text
-Welcome_ForegroundPrimaryColor=ff999999
-Welcome_ForegroundSecondaryColor=ff808080
-Welcome_BackgroundColor=normalBackground
-Welcome_ButtonBackgroundColor=normalBackground
-Welcome_DividerColor=ff555555
-Welcome_HoverColor=ff444444
-Welcome_LinkColor=ff7fc63c
-Welcome_DisabledLinkColor=textDisabled
-
-Timeline_TextColor=text
-Timeline_BackgroundColor1=normalBackground
-Timeline_BackgroundColor2=ff444444
-Timeline_DividerColor=ff555555
-Timeline_HighlightColor=ff3099dc
-Timeline_PanelBackgroundColor=ff808080
-Timeline_PanelHeaderColor=alternateBackground
-Timeline_HandleColor=alternateBackground
-Timeline_RangeColor=selectedBackground
-
-VcsBase_FileStatusUnknown_TextColor=text
-VcsBase_FileAdded_TextColor=ff00ff00
-VcsBase_FileModified_TextColor=ff8ee0ff
-VcsBase_FileDeleted_TextColor=fffff6c6c
-VcsBase_FileRenamed_TextColor=ffffa500
-VcsBase_FileUnmerged_TextColor=ffff4040
-
-Bookmarks_TextMarkColor=ff8080ff
-
-TextEditor_SearchResult_ScrollBarColor=ff00c000
-TextEditor_CurrentLine_ScrollBarColor=ffffffff
-
-ProjectExplorer_TaskError_TextMarkColor=error
-ProjectExplorer_TaskWarn_TextMarkColor=warning
-
-CodeModel_Error_TextMarkColor=error
-CodeModel_Warning_TextMarkColor=warning
-
-
-;Designer Main colors
-
-; Design View panel backgrounds - Library, Form Viewer, Properties, States, Timeline & Connections. - lOOKS LIKE IS NO LONGER USED.
-QmlDesigner_BackgroundColor=ff4c4e50
-;QmlDesigner_BackgroundColor=ffd3299a
-
-
-; Design View selected items - Navigator Selection, Timeline Property Selection, TImeline bar, property text highlighted
-QmlDesigner_HighlightColor=ff0492c9
-
-
-
-; live selection color for the form editors smart guides.
-;QmlDesigner_FormEditorSelectionColor=ff4ba2ff
-QmlDesigner_FormEditorSelectionColor=ffd3299a
-
-
-;color for lable text in form editor
-QmlDesigner_FormEditorForegroundColor=ffdadada
-;QmlDesigner_FormEditorForegroundColor=ffd3299a
-
-
-
-
-;new colors
-
-;background color for main form view, library, navigator, properties, connections
-;QmlDesigner_BackgroundColorDarkAlternate=ff4c4e50
-QmlDesigner_BackgroundColorDarkAlternate=ff262626
-
-;filter outlines, override W/H outlines, properties spinbox background, timeline separators.
-;QmlDesigner_BackgroundColorDarker=ff262728
-QmlDesigner_BackgroundColorDarker=ff191919
-
-;properties outlines, states thumbnail outlines, add state button outlines.
-;QmlDesigner_BorderColor=splitter
-QmlDesigner_BorderColor=ff353535
-
-;background sqaures for components, effects, etc. Handles for scrollbars, type background in properties.
-;QmlDesigner_ButtonColor=ff595b5c
-QmlDesigner_ButtonColor=ff353535
-
-
-;non - selected tabs, text color for selected tabs.
-;QmlDesigner_TabDark=shadowBackground
-QmlDesigner_TabDark=ff111111
-
-
-;active tab backgrounds and non selected tab text.
-QmlDesigner_TabLight=text
-;QmlDesigner_TabLight=ff262626
-
-;extra_new_colors
-
-
-QmlDesigner_FormeditorBackgroundColor=ff000000
-
-QmlDesigner_AlternateBackgroundColor=ffc14fc1
-
-QmlDesigner_ScrollBarHandleColor=ff595b5c
-
-
-
-;palette colors
-
-;outline colors on the combo box, zoom slider, flowtag button, dialog outlines, on loading project the whole screen flashes this color
-;PaletteWindow=normalBackground
-PaletteWindow=ff262626
-
-
-
-; item text for search results panel and application output panel, twirl down triangles in edit mode, text editor.
-PaletteWindowText=text
-;PaletteWindowText=ffd3299a
-
-
-;Search bar background, edit view project list background, style combo box background
-PaletteBase=normalBackground
-;PaletteBase=ff191919
-
-
-
-;can't see where this is used.
-PaletteAlternateBase=alternateBackground
-;PaletteAlternateBase=ffd3299a
-
-
-
-;flow tag backgrounds, import combobox background, edit mode scrollbars
-;PaletteButton=shadowBackground
-PaletteButton=ff262626
-
-
-
-;alternate text in the search and application output panel - NO LONGER SEEMS TO DO ANYTHING
-PaletteBrightText=ffff3333
-;PaletteBrightText=ffd3299a
-
-
-; text inside dropdown combo boxes, styles, connections.
-PaletteText=text
-;PaletteText=ffd3299a
-
-
-
-;text for flowtags, import dropdown, ticks for tick boxes.
-PaletteButtonText=text
-;PaletteButtonText=ffd3299a
-
-
-PaletteButtonTextDisabled=textDisabled
-
-
-;background color for the tool tip hover background
-PaletteToolTipBase=selectedBackground
-;PaletteToolTipBase=ffd3299a
-
-
-;the selection highlight on the dropdown combo box in the file selection top menu and connections panel and tab mode selector dropdowns
-PaletteHighlight=selectedBackgroundText
-
-
-; outline of warning in editor mode, underline of "open a document" page in the edit mode
-PaletteDark=shadowBackground
-;PaletteDark=ffd3299a
-
-
-;selected text highlight in edit and design studio modes
-PaletteHighlightedText=ffffffff
-;PaletteHighlightedText=ffd3299a
-
-
-; text for for floating tool tips
-PaletteToolTipText=text
-;PaletteToolTipText=ffd3299a
-
-
-PaletteLink=textColorLink
-PaletteLinkVisited=textColorLinkVisited
-PaletteWindowDisabled=backgroundColorDisabled
-PaletteWindowTextDisabled=textDisabled
-PaletteBaseDisabled=backgroundColorDisabled
-PaletteTextDisabled=textDisabled
-
-[Flags]
-ComboBoxDrawTextShadow=false
-DerivePaletteFromTheme=true
-DrawIndicatorBranch=true
-DrawSearchResultWidgetFrame=false
-DrawTargetSelectorBottom=false
-DrawToolBarHighlights=false
-DrawToolBarBorders=false
-ApplyThemePaletteGlobally=true
-FlatToolBars=true
-FlatSideBarIcons=true
-FlatProjectsMode=true
-FlatMenuBar=true
-ToolBarIconShadow=true
-WindowColorAsBase=false
-DarkUserInterface=true
-
-[Gradients]
-DetailsWidgetHeaderGradient\1\color=00000000
-DetailsWidgetHeaderGradient\1\pos=1
-DetailsWidgetHeaderGradient\size=1
diff --git a/share/qtcreator/themes/design.creatortheme b/share/qtcreator/themes/design.creatortheme
index 194f32b1c8..914a717bdf 100644
--- a/share/qtcreator/themes/design.creatortheme
+++ b/share/qtcreator/themes/design.creatortheme
@@ -1,5 +1,5 @@
 [General]
-ThemeName=Design
+ThemeName=Design Dark
 PreferredStyles=Fusion
 DefaultTextEditorColorScheme=creator-dark.xml
 
diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts
index fb7c6d36e0..dbe962908f 100644
--- a/share/qtcreator/translations/qtcreator_ru.ts
+++ b/share/qtcreator/translations/qtcreator_ru.ts
@@ -738,7 +738,7 @@ The files in the Android package source directory are copied to the build direct
     </message>
     <message>
         <source>This is useful for apps that use SSL operations. The path can be defined in Tools &gt; Options &gt; Devices &gt; Android.</source>
-        <translation>Полезно для приложений, использующих операции SSL. Путь можно задать в Инструменты &gt; Настройки &gt; Устройства &gt; Android.</translation>
+        <translation>Полезно для приложений, использующих операции SSL. Путь можно задать в Инструменты &gt; Параметры &gt; Устройства &gt; Android.</translation>
     </message>
     <message>
         <source>Build Android APK</source>
@@ -1237,7 +1237,7 @@ Do you want to uninstall the existing package?</source>
     <name>Android::Internal::AndroidPlugin</name>
     <message>
         <source>Would you like to configure Android options? This will ensure Android kits can be usable and all essential packages are installed. To do it later, select Options &gt; Devices &gt; Android.</source>
-        <translation>Настроить Android? Предполагается, что комплекты Android доступны, а необходимые пакеты установлены. Чтобы сделать это позже перейдите в Настройки &gt; Устройства &gt; Android.</translation>
+        <translation>Настроить Android? Предполагается, что комплекты Android доступны, а необходимые пакеты установлены. Чтобы сделать это позже перейдите в Параметры &gt; Устройства &gt; Android.</translation>
     </message>
     <message>
         <source>Configure Android</source>
@@ -25719,7 +25719,7 @@ Error: %5</translation>
     </message>
     <message>
         <source>Sampler name</source>
-        <translation type="unfinished">Имя семплера</translation>
+        <translation>Имя семплера</translation>
     </message>
     <message>
         <source>Sets the name of the effect&apos;s source texture property.</source>
@@ -26475,10 +26475,6 @@ Error: %5</translation>
         <source>NXP i.MXRT SDK</source>
         <translation>NXP i.MXRT SDK</translation>
     </message>
-    <message>
-        <source>SEGGER JLink</source>
-        <translation>SEGGER JLink</translation>
-    </message>
 </context>
 <context>
     <name>McuSupport::Internal::McuSupportDevice</name>
@@ -26507,6 +26503,17 @@ Error: %5</translation>
     </message>
 </context>
 <context>
+    <name>McuSupport::Internal::McuSupportPlugin</name>
+    <message>
+        <source>Create Kits for Qt for MCUs? To do it later, select Options &gt; Devices &gt; MCU.</source>
+        <translation>Создать комплекты для Qt для микроконтроллеров? Можно сделать позже через Параметры &gt; Устройства &gt; Микроконтроллер.</translation>
+    </message>
+    <message>
+        <source>Create Kits for Qt for MCUs</source>
+        <translation>Создать комплекты для Qt для микроконтроллеров</translation>
+    </message>
+</context>
+<context>
     <name>Mercurial::Internal::AuthenticationDialog</name>
     <message>
         <source>Dialog</source>
@@ -31154,7 +31161,7 @@ What should Qt Creator do now?</source>
     </message>
     <message>
         <source>Disable in subdirectories:</source>
-        <translation>Выключить по подкаталогах:</translation>
+        <translation>Выключить в подкаталогах:</translation>
     </message>
     <message>
         <source>Runs this step only for a top-level build.</source>
@@ -40337,42 +40344,14 @@ For more information, see the &quot;Checking Code Syntax&quot; documentation.</s
         <translation>Ожидается определение зависимостей</translation>
     </message>
     <message>
-        <source>Expected only Property, Method, Signal and Enum object definitions, not &quot;%1&quot;.</source>
-        <translation>Ожидаются только определения объектов Property, Method, Signal и Enum, а не «%1».</translation>
-    </message>
-    <message>
-        <source>Expected only name, prototype, defaultProperty, attachedType, exports, isSingleton, isCreatable, isComposite and exportMetaObjectRevisions script bindings, not &quot;%1&quot;.</source>
-        <translation>Ожидаются только связки со скриптами name, prototype, defaultProperty, attachedType, exports, isSingleton, isCreatable, isComposite и exportMetaObjectRevisions, но не «%1».</translation>
-    </message>
-    <message>
-        <source>Expected only script bindings and object definitions.</source>
-        <translation>Ожидаются только связки со скриптами и определения объектов.</translation>
-    </message>
-    <message>
         <source>Component definition is missing a name binding.</source>
         <translation>В определении компонента отсутствует связка name.</translation>
     </message>
     <message>
-        <source>Expected only uri, version and name script bindings.</source>
-        <translation>Ожидаются только связки со скриптами uri, version и name.</translation>
-    </message>
-    <message>
-        <source>Expected only script bindings.</source>
-        <translation>Ожидаются только связки со скриптами.</translation>
-    </message>
-    <message>
         <source>ModuleApi definition has no or invalid version binding.</source>
         <translation>У определения ModuleApi связка version отсутствует или некорректна.</translation>
     </message>
     <message>
-        <source>Expected only Parameter object definitions.</source>
-        <translation>Ожидаются только определения объектов Parameter.</translation>
-    </message>
-    <message>
-        <source>Expected only name and type script bindings.</source>
-        <translation>Ожидаются только связки со скриптами name и type.</translation>
-    </message>
-    <message>
         <source>Method or signal is missing a name script binding.</source>
         <translation>У метода или сигнала отсутствует связка со скриптами name.</translation>
     </message>
@@ -40381,18 +40360,10 @@ For more information, see the &quot;Checking Code Syntax&quot; documentation.</s
         <translation>Ожидается связка со скриптом.</translation>
     </message>
     <message>
-        <source>Expected only type, name, revision, isPointer, isReadonly and isList script bindings.</source>
-        <translation>Ожидаются только связки со скриптами type, name, revision, isPointer, isReadonly и isList.</translation>
-    </message>
-    <message>
         <source>Property object is missing a name or type script binding.</source>
         <translation>У объекта Property отсутствует связка со скриптами name или type.</translation>
     </message>
     <message>
-        <source>Expected only name and values script bindings.</source>
-        <translation>Ожидаются только связки со скриптами name и values.</translation>
-    </message>
-    <message>
         <source>Expected string after colon.</source>
         <translation>Ожидается строка после запятой.</translation>
     </message>
@@ -42736,7 +42707,7 @@ For more details, see /etc/sysctl.d/10-ptrace.conf
     <name>QtSupport::Internal::QtSupportPlugin</name>
     <message>
         <source>Link with a Qt installation to automatically register Qt versions and kits? To do this later, select Options &gt; Kits &gt; Qt Versions &gt; Link with Qt.</source>
-        <translation>Связать с Qt для автоматической регистрации профилей Qt и комплектов? Это можно сделать позже в меню Настройки &gt; Комплекты &gt; Профили Qt &gt; Связать с Qt.</translation>
+        <translation>Связать с Qt для автоматической регистрации профилей Qt и комплектов? Это можно сделать позже в меню Параметры &gt; Комплекты &gt; Профили Qt &gt; Связать с Qt.</translation>
     </message>
     <message>
         <source>Link with Qt</source>
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 1518e1ee8e..0fadcc150a 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -3261,7 +3261,7 @@ void GdbEngine::handlePeripheralRegisterListValues(
 
     const QString output = response.consoleStreamOutput;
     // Regexp to match for '0x50060800:\t0\n'.
-    const QRegularExpression re("^(0x[0-9A-F]+):\\t(\\d+)\\n$");
+    const QRegularExpression re("^(0x[0-9A-Fa-f]+):\\t(\\d+)\\n$");
     const QRegularExpressionMatch m = re.match(output);
     if (!m.hasMatch())
         return;
diff --git a/src/plugins/marketplace/productlistmodel.cpp b/src/plugins/marketplace/productlistmodel.cpp
index a49f544c3d..cded10ee37 100644
--- a/src/plugins/marketplace/productlistmodel.cpp
+++ b/src/plugins/marketplace/productlistmodel.cpp
@@ -106,7 +106,7 @@ void ProductListModel::onFetchCollectionsFinished(QNetworkReply *reply)
             const auto handle = obj.value("handle").toString();
             const int productsCount = obj.value("products_count").toInt();
 
-            if (productsCount > 0 && handle != "all-products")
+            if (productsCount > 0 && handle != "all-products" && handle != "qt-education-1")
                 m_pendingCollections.append(handle);
         }
         if (!m_pendingCollections.isEmpty())
diff --git a/src/plugins/mcusupport/mcusupportoptionspage.cpp b/src/plugins/mcusupport/mcusupportoptionspage.cpp
index b06a97f174..56db70972a 100644
--- a/src/plugins/mcusupport/mcusupportoptionspage.cpp
+++ b/src/plugins/mcusupport/mcusupportoptionspage.cpp
@@ -43,6 +43,7 @@
 #include <QFormLayout>
 #include <QGroupBox>
 #include <QLabel>
+#include <QPushButton>
 #include <QVBoxLayout>
 
 namespace McuSupport {
@@ -77,6 +78,8 @@ private:
     QGroupBox *m_kitCreationGroupBox = nullptr;
     Utils::InfoLabel *m_kitCreationInfoLabel = nullptr;
     Utils::InfoLabel *m_statusInfoLabel = nullptr;
+    QPushButton *m_kitCreationPushButton = nullptr;
+    QPushButton *m_kitRemovalPushButton = nullptr;
 };
 
 McuSupportOptionsWidget::McuSupportOptionsWidget()
@@ -130,10 +133,24 @@ McuSupportOptionsWidget::McuSupportOptionsWidget()
         m_kitCreationGroupBox->setFlat(true);
         mainLayout->addWidget(m_kitCreationGroupBox);
         m_kitCreationInfoLabel = new Utils::InfoLabel;
-        m_kitCreationInfoLabel->setElideMode(Qt::ElideNone);
-        m_kitCreationInfoLabel->setWordWrap(true);
-        auto layout = new QVBoxLayout(m_kitCreationGroupBox);
-        layout->addWidget(m_kitCreationInfoLabel);
+        auto vLayout = new QHBoxLayout(m_kitCreationGroupBox);
+        vLayout->addWidget(m_kitCreationInfoLabel);
+        m_kitCreationPushButton = new QPushButton(tr("Create Kit"));
+        m_kitCreationPushButton->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
+        connect(m_kitCreationPushButton, &QPushButton::clicked, this, [this] {
+            McuSupportOptions::newKit(currentMcuTarget(), m_options.qtForMCUsSdkPackage);
+            McuSupportOptions::registerQchFiles();
+            updateStatus();
+        });
+        m_kitRemovalPushButton = new QPushButton(tr("Remove Kit"));
+        m_kitRemovalPushButton->setSizePolicy(m_kitCreationPushButton->sizePolicy());
+        connect(m_kitRemovalPushButton, &QPushButton::clicked, this, [this] {
+            for (auto existingKit : McuSupportOptions::existingKits(currentMcuTarget()))
+                ProjectExplorer::KitManager::deregisterKit(existingKit);
+            updateStatus();
+        });
+        vLayout->addWidget(m_kitCreationPushButton);
+        vLayout->addWidget(m_kitRemovalPushButton);
     }
 
     mainLayout->addStretch();
@@ -162,15 +179,23 @@ void McuSupportOptionsWidget::updateStatus()
     // Kit creation status
     if (mcuTarget) {
         const bool mcuTargetValid = mcuTarget->isValid();
-        m_kitCreationInfoLabel->setType(mcuTargetValid ? Utils::InfoLabel::Ok
-                                                       : Utils::InfoLabel::NotOk);
-        m_kitCreationInfoLabel->setText(
-                    mcuTargetValid ? QString::fromLatin1(
-                                         "A kit <b>%1</b> for the selected target can be "
-                                         "generated. Press Apply to generate it.")
-                                     .arg(McuSupportOptions::kitName(mcuTarget))
-                                   : "Provide the package paths in order to create a kit "
-                                     "for your target.");
+        m_kitCreationPushButton->setVisible(mcuTargetValid);
+        m_kitRemovalPushButton->setVisible(mcuTargetValid);
+        if (mcuTargetValid) {
+            const bool mcuTargetKitExists = !McuSupportOptions::existingKits(mcuTarget).isEmpty();
+            m_kitCreationInfoLabel->setType(mcuTargetKitExists
+                                            ? Utils::InfoLabel::Information
+                                            : Utils::InfoLabel::Ok);
+            m_kitCreationInfoLabel->setText(mcuTargetKitExists
+                                            ? tr("A kit for the selected target exists.")
+                                            : tr("A kit for the selected target can be created."));
+            m_kitCreationPushButton->setEnabled(!mcuTargetKitExists);
+            m_kitRemovalPushButton->setEnabled(mcuTargetKitExists);
+        } else {
+            m_kitCreationInfoLabel->setType(Utils::InfoLabel::NotOk);
+            m_kitCreationInfoLabel->setText("Provide the package paths in order to create a kit "
+                                            "for your target.");
+        }
     }
 
     // Status label in the bottom
@@ -226,19 +251,6 @@ void McuSupportOptionsWidget::apply()
     m_options.qtForMCUsSdkPackage->writeToSettings();
     for (auto package : m_options.packages)
         package->writeToSettings();
-
-    if (!isVisible())
-        return;
-
-    McuSupportOptions::registerQchFiles();
-
-    const McuTarget *mcuTarget = currentMcuTarget();
-    if (!mcuTarget)
-        return;
-
-    for (auto existingKit : McuSupportOptions::existingKits(mcuTarget))
-        ProjectExplorer::KitManager::deregisterKit(existingKit);
-    McuSupportOptions::newKit(mcuTarget, m_options.qtForMCUsSdkPackage);
 }
 
 void McuSupportOptionsWidget::populateMcuTargetsComboBox()
diff --git a/src/plugins/projectexplorer/msvcparser.cpp b/src/plugins/projectexplorer/msvcparser.cpp
index 39a41f3663..9512ed94a3 100644
--- a/src/plugins/projectexplorer/msvcparser.cpp
+++ b/src/plugins/projectexplorer/msvcparser.cpp
@@ -202,7 +202,7 @@ void MsvcParser::doFlush()
 // ".\qwindowsgdinativeinterface.cpp(48,3) :  error: unknown type name 'errr'"
 static inline QString clangClCompilePattern()
 {
-    return QLatin1String(FILE_POS_PATTERN) + " (warning|error): (.*)$";
+    return QLatin1String(FILE_POS_PATTERN) + " ?(warning|error): (.*)$";
 }
 
 ClangClParser::ClangClParser()
@@ -624,6 +624,27 @@ void ProjectExplorerPlugin::testClangClOutputParsers_data()
                 << CompileTask(Task::Error, error2.trimmed(),
                                FilePath::fromUserInput(".\\qwindowsgdinativeinterface.cpp"), 51))
             << "";
+
+    QTest::newRow("other error")
+            << "C:\\Program Files\\LLVM\\bin\\clang-cl.exe /nologo /c /EHsc /Od -m64 /Zi /MDd "
+               "/DUNICODE /D_UNICODE /DWIN32 /FdTestForError.cl.pdb "
+               "/FoC:\\MyData\\Project_home\\cpp\build-TestForError-msvc_2017_clang-Debug\\Debug_msvc_201_47eca974c876c8b3\\TestForError.b6dd39ae\\3a52ce780950d4d9\\main.cpp.obj "
+               "C:\\MyData\\Project_home\\cpp\\TestForError\\main.cpp /TP\r\n"
+               "C:\\MyData\\Project_home\\cpp\\TestForError\\main.cpp(3,10): error: expected ';' after return statement\r\n"
+               "return 0\r\n"
+               "              ^\r\n"
+               "              ;"
+            << OutputParserTester::STDERR
+            << ""
+            << "C:\\Program Files\\LLVM\\bin\\clang-cl.exe /nologo /c /EHsc /Od -m64 /Zi /MDd "
+               "/DUNICODE /D_UNICODE /DWIN32 /FdTestForError.cl.pdb "
+               "/FoC:\\MyData\\Project_home\\cpp\build-TestForError-msvc_2017_clang-Debug\\Debug_msvc_201_47eca974c876c8b3\\TestForError.b6dd39ae\\3a52ce780950d4d9\\main.cpp.obj "
+               "C:\\MyData\\Project_home\\cpp\\TestForError\\main.cpp /TP\r\n"
+               "              ;\n"
+            << Tasks{CompileTask(Task::Error, "expected ';' after return statement\nreturn 0",
+                                 FilePath::fromUserInput("C:\\MyData\\Project_home\\cpp\\TestForError\\main.cpp"),
+                                 3)}
+            << "";
 }
 
 void ProjectExplorerPlugin::testClangClOutputParsers()
@@ -632,9 +653,9 @@ void ProjectExplorerPlugin::testClangClOutputParsers()
     testbench.appendOutputParser(new ClangClParser);
     QFETCH(QString, input);
     QFETCH(OutputParserTester::Channel, inputChannel);
-    QFETCH(Tasks, tasks);
     QFETCH(QString, childStdOutLines);
     QFETCH(QString, childStdErrLines);
+    QFETCH(Tasks, tasks);
     QFETCH(QString, outputLines);
 
     testbench.testParsing(input, inputChannel,
diff --git a/tests/auto/extensionsystem/plugin.qbs b/tests/auto/extensionsystem/plugin.qbs
index a0496e7dbb..68e259fafd 100644
--- a/tests/auto/extensionsystem/plugin.qbs
+++ b/tests/auto/extensionsystem/plugin.qbs
@@ -1,5 +1,5 @@
-import qbs
 import qbs.FileInfo
+import qbs.Utilities
 import QtcFunctions
 
 DynamicLibrary {
@@ -12,6 +12,16 @@ DynamicLibrary {
     targetName: QtcFunctions.qtLibraryName(qbs, name.split('_')[1])
     destinationDirectory: project.buildDirectory + '/'
                           + FileInfo.relativePath(project.ide_source_tree, sourceDirectory)
+    cpp.cxxFlags: {
+        var flags = [];
+        if (qbs.toolchain.contains("clang")
+                && !qbs.hostOS.contains("darwin")
+                && Utilities.versionCompare(cpp.compilerVersion, "10") >= 0) {
+             // Triggers a lot in Qt.
+            flags.push("-Wno-deprecated-copy", "-Wno-constant-logical-operand");
+        }
+        return flags;
+    }
     cpp.rpaths: [
         project.buildDirectory + "/" + qtc.libDirName + "/qtcreator",
         project.buildDirectory + "/" + qtc.libDirName + "/qtcreator/plugins"
author	Tim Jenssen <tim.jenssen@qt.io>	2020-05-12 09:59:55 +0200
committer	Tim Jenssen <tim.jenssen@qt.io>	2020-05-12 09:59:55 +0200
commit	c9b56717542749b271d5e48c7bf7698884e94f8f (patch)
tree	424aabcf1197798d2294cb05eb047d51c4f82bce
parent	6ab2f93f184470998e452cd709a881258dfef6a0 (diff)
parent	8e1169f4bf6fc97f7f864cefeb5a273f271798cf (diff)