Merge remote-tracking branch 'origin/4.12' into qds-1.50

Change-Id: Iee9542b518367018b6e672ff920bfdb411639f8b
2020-05-12 09:59:55 +02:00
parent 6ab2f93f18 8e1169f4bf
commit c9b5671754
208 changed files with 238 additions and 738 deletions
--- 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/
--- 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)

 #
--- a/dist/changes-4.12.1.md
+++ 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:
+--------------------------------
--- a/doc/qtcreator/images/qmldesigner-element-size.png
+++ b/doc/qtcreator/images/qmldesigner-element-size.png
--- a/doc/qtcreator/images/qmldesigner-form-editor.png
+++ b/doc/qtcreator/images/qmldesigner-form-editor.png
--- a/doc/qtcreator/images/qmldesigner-navigator-arrows.png
+++ b/doc/qtcreator/images/qmldesigner-navigator-arrows.png
--- a/doc/qtcreator/images/qmldesigner-navigator.png
+++ b/doc/qtcreator/images/qmldesigner-navigator.png
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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)
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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)
--- 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
--- 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
--- 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
--- 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
--- 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)
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/doc/qtcreator/src/howto/creator-external-tools.qdoc
+++ b/doc/qtcreator/src/howto/creator-external-tools.qdoc
@@ -30,7 +30,6 @@
 // **********************************************************************

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 /*!
-    \contentspage index.html
    \previouspage creator-sidebars.html
    \page creator-project-managing-workspaces.html
    \nextpage creator-output-panes.html
--- 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
--- 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)
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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}
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/Show More
+++ b/Show More