Merge remote-tracking branch 'origin/12.0' into qds/dev

Change-Id: Iefea658312bba6675eadce23fb8dc92f9207ea0e

.github/workflows/build_cmake.yml

@@ -7,9 +7,9 @@ on:
       - 'doc/**'
 
 env:
-  QT_VERSION: 6.5.2
+  QT_VERSION: 6.6.0
   MACOS_DEPLOYMENT_TARGET: 10.15
-  CLANG_VERSION: 16.0.2
+  CLANG_VERSION: 17.0.1
   ELFUTILS_VERSION: 0.175
   CMAKE_VERSION: 3.21.1
   NINJA_VERSION: 1.10.2
@@ -201,7 +201,7 @@ jobs:
           set(url_os "linux_x64")
           set(qt_package_arch_suffix "gcc_64")
           set(qt_dir_prefix "${qt_version}/gcc_64")
-          set(qt_package_suffix "-Linux-RHEL_8_4-GCC-Linux-RHEL_8_4-X86_64")
+          set(qt_package_suffix "-Linux-RHEL_8_6-GCC-Linux-RHEL_8_6-X86_64")
         elseif ("${{ runner.os }}" STREQUAL "macOS")
           set(url_os "mac_x64")
           set(qt_package_arch_suffix "clang_64")
@@ -374,7 +374,7 @@ jobs:
             set(libclang "libclang-release_${clang_version}-based-windows-vs2019_32.7z")
           endif()
         elseif ("${{ runner.os }}" STREQUAL "Linux")
-          set(libclang "libclang-release_${clang_version}-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z")
+          set(libclang "libclang-release_${clang_version}-based-linux-Ubuntu22.04-gcc11.4-x86_64.7z")
         elseif ("${{ runner.os }}" STREQUAL "macOS")
           set(libclang "libclang-release_${clang_version}-based-macos-universal.7z")
         endif()
@@ -663,8 +663,8 @@ jobs:
         if (NOT result EQUAL 0)
           string(REGEX MATCH "[0-9]+% tests.*[0-9.]+ sec.*$" test_results "${output}")
           string(REPLACE "\n" "%0A" test_results "${test_results}")
-          # Do not fail on ctest failure
-          message("::warning::${test_results}")
+          message("::error::${test_results}")
+          message(FATAL_ERROR "Tests failed")
         endif()
 
     - name: Upload

.gitignore

@@ -56,6 +56,7 @@ CMakeLists.txt.user*
 /share/qtcreator/qmldesigner/QtProject/
 /src/app/Info.plist
 /src/plugins/**/*.json
+!/src/plugins/**/wizard.json
 /src/plugins/coreplugin/ide_version.h
 /src/libs/qt-breakpad/bin
 /.cmake/

README.md

@@ -998,3 +998,36 @@ SQLite (https://www.sqlite.org) is in the Public Domain.
   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+### RSTParser
+
+  RSTParser is an open-source C++ library for parsing reStructuredText
+
+  https://github.com/vitaut-archive/rstparser
+
+  License
+  -------
+
+  Copyright (c) 2013, Victor Zverovich
+
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+
+  1. Redistributions of source code must retain the above copyright notice, this
+     list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright notice,
+     this list of conditions and the following disclaimer in the documentation
+     and/or other materials provided with the distribution.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

cmake/Findyaml-cpp.cmake

@@ -37,6 +37,7 @@ else()
       ${YAML_SOURCE_DIR}/include/yaml-cpp
       ${YAML_SOURCE_DIR}/include/yaml-cpp/anchor.h
       ${YAML_SOURCE_DIR}/include/yaml-cpp/binary.h
+      ${YAML_SOURCE_DIR}/include/yaml-cpp/depthguard.h
       ${YAML_SOURCE_DIR}/include/yaml-cpp/dll.h
       ${YAML_SOURCE_DIR}/include/yaml-cpp/emitfromevents.h
       ${YAML_SOURCE_DIR}/include/yaml-cpp/emitter.h
@@ -46,10 +47,10 @@ else()
       ${YAML_SOURCE_DIR}/include/yaml-cpp/eventhandler.h
       ${YAML_SOURCE_DIR}/include/yaml-cpp/exceptions.h
       ${YAML_SOURCE_DIR}/include/yaml-cpp/mark.h
+      ${YAML_SOURCE_DIR}/include/yaml-cpp/noexcept.h
       ${YAML_SOURCE_DIR}/include/yaml-cpp/node
       ${YAML_SOURCE_DIR}/include/yaml-cpp/node/convert.h
       ${YAML_SOURCE_DIR}/include/yaml-cpp/node/detail
-      ${YAML_SOURCE_DIR}/include/yaml-cpp/node/detail/bool_type.h
       ${YAML_SOURCE_DIR}/include/yaml-cpp/node/detail/impl.h
       ${YAML_SOURCE_DIR}/include/yaml-cpp/node/detail/iterator.h
       ${YAML_SOURCE_DIR}/include/yaml-cpp/node/detail/iterator_fwd.h
@@ -65,7 +66,6 @@ else()
       ${YAML_SOURCE_DIR}/include/yaml-cpp/node/parse.h
       ${YAML_SOURCE_DIR}/include/yaml-cpp/node/ptr.h
       ${YAML_SOURCE_DIR}/include/yaml-cpp/node/type.h
-      ${YAML_SOURCE_DIR}/include/yaml-cpp/noncopyable.h
       ${YAML_SOURCE_DIR}/include/yaml-cpp/null.h
       ${YAML_SOURCE_DIR}/include/yaml-cpp/ostream_wrapper.h
       ${YAML_SOURCE_DIR}/include/yaml-cpp/parser.h
@@ -75,6 +75,7 @@ else()
       ${YAML_SOURCE_DIR}/src/binary.cpp
       ${YAML_SOURCE_DIR}/src/collectionstack.h
       ${YAML_SOURCE_DIR}/src/convert.cpp
+      ${YAML_SOURCE_DIR}/src/depthguard.cpp
       ${YAML_SOURCE_DIR}/src/directives.cpp
       ${YAML_SOURCE_DIR}/src/directives.h
       ${YAML_SOURCE_DIR}/src/emit.cpp

cmake/QtCreatorAPI.cmake

@@ -37,13 +37,14 @@ list(APPEND DEFAULT_DEFINES
 # use CMAKE_CURRENT_FUNCTION_LIST_DIR when we can require CMake 3.17
 set(_THIS_MODULE_BASE_DIR "${CMAKE_CURRENT_LIST_DIR}")
 
+qtc_env_with_default("QTC_WITH_CCACHE_SUPPORT" ENV_WITH_CCACHE_SUPPORT OFF)
 option(BUILD_PLUGINS_BY_DEFAULT "Build plugins by default. This can be used to build all plugins by default, or none." ON)
 option(BUILD_EXECUTABLES_BY_DEFAULT "Build executables by default. This can be used to build all executables by default, or none." ON)
 option(BUILD_LIBRARIES_BY_DEFAULT "Build libraries by default. This can be used to build all libraries by default, or none." ON)
 option(BUILD_TESTS_BY_DEFAULT "Build tests by default. This can be used to build all tests by default, or none." ON)
 option(QTC_SEPARATE_DEBUG_INFO "Extract debug information from binary files." OFF)
 option(WITH_SCCACHE_SUPPORT "Enables support for building with SCCACHE and separate debug info with MSVC, which SCCACHE normally doesn't support." OFF)
-option(WITH_CCACHE_SUPPORT "Enables support for building with CCACHE and separate debug info with MSVC, which CCACHE normally doesn't support." OFF)
+option(WITH_CCACHE_SUPPORT "Enables support for building with CCACHE and separate debug info with MSVC, which CCACHE normally doesn't support." "${ENV_WITH_CCACHE_SUPPORT}")
 option(QTC_STATIC_BUILD "Builds libraries and plugins as static libraries" OFF)
 
 # If we provide a list of plugins, executables, libraries, then the BUILD_<type>_BY_DEFAULT will be set to OFF
@@ -322,7 +323,7 @@ endfunction(add_qtc_library)
 function(add_qtc_plugin target_name)
   cmake_parse_arguments(_arg
     "SKIP_INSTALL;INTERNAL_ONLY;SKIP_TRANSLATION;EXPORT;SKIP_PCH"
-    "VERSION;COMPAT_VERSION;PLUGIN_JSON_IN;PLUGIN_PATH;PLUGIN_NAME;OUTPUT_NAME;BUILD_DEFAULT;PLUGIN_CLASS"
+    "VERSION;COMPAT_VERSION;PLUGIN_PATH;PLUGIN_NAME;OUTPUT_NAME;BUILD_DEFAULT;PLUGIN_CLASS"
     "CONDITION;DEPENDS;PUBLIC_DEPENDS;DEFINES;PUBLIC_DEFINES;INCLUDES;SYSTEM_INCLUDES;PUBLIC_INCLUDES;PUBLIC_SYSTEM_INCLUDES;SOURCES;EXPLICIT_MOC;SKIP_AUTOMOC;EXTRA_TRANSLATIONS;PLUGIN_DEPENDS;PLUGIN_RECOMMENDS;PLUGIN_TEST_DEPENDS;PROPERTIES"
     ${ARGN}
   )
@@ -420,29 +421,20 @@ function(add_qtc_plugin target_name)
   )
   string(APPEND _arg_DEPENDENCY_STRING "\n    ]")
 
-  set(IDE_PLUGIN_DEPENDENCY_STRING ${_arg_DEPENDENCY_STRING})
+  set(IDE_PLUGIN_DEPENDENCIES ${_arg_DEPENDENCY_STRING})
 
   ### Configure plugin.json file:
   if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${name}.json.in")
     list(APPEND _arg_SOURCES ${name}.json.in)
     file(READ "${name}.json.in" plugin_json_in)
-    string(REPLACE "\\\"" "\"" plugin_json_in ${plugin_json_in})
-    string(REPLACE "\\'" "'" plugin_json_in ${plugin_json_in})
-    string(REPLACE "$$QTCREATOR_VERSION" "\${IDE_VERSION}" plugin_json_in ${plugin_json_in})
-    string(REPLACE "$$QTCREATOR_COMPAT_VERSION" "\${IDE_VERSION_COMPAT}" plugin_json_in ${plugin_json_in})
-    string(REPLACE "$$QTCREATOR_COPYRIGHT_YEAR" "\${IDE_COPYRIGHT_YEAR}" plugin_json_in ${plugin_json_in})
-    string(REPLACE "$$QTC_PLUGIN_REVISION" "\${QTC_PLUGIN_REVISION}" plugin_json_in ${plugin_json_in})
-    string(REPLACE "$$dependencyList" "\${IDE_PLUGIN_DEPENDENCY_STRING}" plugin_json_in ${plugin_json_in})
-    if(_arg_PLUGIN_JSON_IN)
-        #e.g. UPDATEINFO_EXPERIMENTAL_STR=true
-        string(REGEX REPLACE "=.*$" "" json_key ${_arg_PLUGIN_JSON_IN})
-        string(REGEX REPLACE "^.*=" "" json_value ${_arg_PLUGIN_JSON_IN})
-        string(REPLACE "$$${json_key}" "${json_value}" plugin_json_in ${plugin_json_in})
+    if(plugin_json_in MATCHES "\\$\\$dependencyList")
+      message(FATAL_ERROR "Found $$dependencyList in ${name}.json.in. "
+              "This is no longer supported. "
+              "Use \${IDE_PLUGIN_DEPENDENCIES}, \${IDE_VERSION} "
+              "and other CMake variables directly. "
+              "Also remove escaping of quotes.")
     endif()
-    string(CONFIGURE "${plugin_json_in}" plugin_json)
-    file(GENERATE
-      OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${name}.json"
-      CONTENT "${plugin_json}")
+    configure_file(${name}.json.in "${CMAKE_CURRENT_BINARY_DIR}/${name}.json")
   endif()
 
   if (QTC_STATIC_BUILD)
@@ -824,7 +816,7 @@ function(extend_qtc_executable name)
 endfunction()
 
 function(add_qtc_test name)
-  cmake_parse_arguments(_arg "GTEST;MANUALTEST;EXCLUDE_FROM_PRECHECK" "TIMEOUT"
+  cmake_parse_arguments(_arg "GTEST;MANUALTEST;EXCLUDE_FROM_PRECHECK;NEEDS_GUI" "TIMEOUT"
       "DEFINES;DEPENDS;INCLUDES;SOURCES;EXPLICIT_MOC;SKIP_AUTOMOC;SKIP_PCH;CONDITION;PROPERTIES" ${ARGN})
 
   if (${_arg_UNPARSED_ARGUMENTS})
@@ -862,7 +854,7 @@ function(add_qtc_test name)
     endif()
   endforeach()
 
-  set(TEST_DEFINES SRCDIR="${CMAKE_CURRENT_SOURCE_DIR}")
+  set(TEST_DEFINES WITH_TESTS SRCDIR="${CMAKE_CURRENT_SOURCE_DIR}")
 
   # relax cast requirements for tests
   get_default_defines(default_defines_copy YES)
@@ -891,8 +883,12 @@ function(add_qtc_test name)
     enable_pch(${name})
   endif()
 
+  if (_arg_NEEDS_GUI)
+    set(EXTRA_ARGUMENTS "-platform" "minimal")
+  endif()
+
   if (NOT _arg_GTEST AND NOT _arg_MANUALTEST)
-    add_test(NAME ${name} COMMAND ${name})
+    add_test(NAME ${name} COMMAND ${name} ${EXTRA_ARGUMENTS})
     if (_arg_EXCLUDE_FROM_PRECHECK)
       set_tests_properties(${name} PROPERTIES LABELS exclude_from_precheck)
     endif()

cmake/QtCreatorAPIInternal.cmake

@@ -21,7 +21,7 @@ include(FeatureSummary)
 list(APPEND DEFAULT_DEFINES
   QT_CREATOR
   QT_NO_JAVA_STYLE_ITERATORS
-  QT_NO_CAST_TO_ASCII QT_RESTRICTED_CAST_FROM_ASCII
+  QT_NO_CAST_TO_ASCII QT_RESTRICTED_CAST_FROM_ASCII QT_NO_FOREACH
   QT_DISABLE_DEPRECATED_BEFORE=0x050900
   QT_USE_QSTRINGBUILDER
 )
@@ -30,9 +30,7 @@ if (WIN32)
   list(APPEND DEFAULT_DEFINES UNICODE _UNICODE _CRT_SECURE_NO_WARNINGS)
 
   if (NOT BUILD_WITH_PCH)
-    # Windows 8 0x0602
     list(APPEND DEFAULT_DEFINES
-      WINVER=0x0602 _WIN32_WINNT=0x0602
       WIN32_LEAN_AND_MEAN)
   endif()
 endif()
@@ -49,7 +47,7 @@ if (APPLE)
 
   set(_IDE_LIBRARY_BASE_PATH "Frameworks")
   set(_IDE_LIBRARY_PATH "${_IDE_OUTPUT_PATH}/${_IDE_LIBRARY_BASE_PATH}")
-  set(_IDE_PLUGIN_PATH "${_IDE_OUTPUT_PATH}/PlugIns")
+  set(_IDE_PLUGIN_PATH "${_IDE_OUTPUT_PATH}/PlugIns/qtcreator")
   set(_IDE_LIBEXEC_PATH "${_IDE_OUTPUT_PATH}/Resources/libexec")
   set(_IDE_DATA_PATH "${_IDE_OUTPUT_PATH}/Resources")
   set(_IDE_DOC_PATH "${_IDE_OUTPUT_PATH}/Resources/doc")
@@ -554,3 +552,12 @@ function(extend_qtc_target target_name)
     set_source_files_properties(${_arg_SOURCES} PROPERTIES ${_arg_SOURCES_PROPERTIES})
   endif()
 endfunction()
+
+function (qtc_env_with_default envName varToSet default)
+  if(DEFINED ENV{${envName}})
+    set(${varToSet} $ENV{${envName}} PARENT_SCOPE)
+  else()
+    set(${varToSet} ${default} PARENT_SCOPE)
+  endif()
+endfunction()
+

cmake/QtCreatorIDEBranding.cmake

@@ -1,6 +1,6 @@
-set(IDE_VERSION "11.0.3")                             # The IDE version.
-set(IDE_VERSION_COMPAT "11.0.0")                      # The IDE Compatibility version.
-set(IDE_VERSION_DISPLAY "11.0.3")                     # The IDE display version.
+set(IDE_VERSION "11.0.84")                            # The IDE version.
+set(IDE_VERSION_COMPAT "11.0.84")                     # The IDE Compatibility version.
+set(IDE_VERSION_DISPLAY "12.0.0-rc1")                 # The IDE display version.
 set(IDE_COPYRIGHT_YEAR "2023")                        # The IDE current copyright year.
 
 set(IDE_SETTINGSVARIANT "QtProject")                  # The IDE settings variation.
@@ -16,6 +16,6 @@ set(IDE_DOC_FILE_ONLINE "qtcreator/qtcreator-online.qdocconf")
 # Absolute, or relative to <qtcreator>/src/app
 # Should contain qtcreator.ico, qtcreator.xcassets
 set(IDE_ICON_PATH "")
-# Absolute, or relative to <qtcreator>/src/plugins/coreplugin
+# Absolute, or relative to <qtcreator>/src/app
 # Should contain images/logo/(16|24|32|48|64|128|256|512)/QtProject-qtcreator.png
 set(IDE_LOGO_PATH "")

cmake/Utils.cmake

@@ -32,7 +32,7 @@ function(setup_dependencies_component)
         set(_ide_app_target \"\${_default_app_target}\")
         if (NOT EXISTS \"\${_ide_app_target}\")
           # The component CPack generators (WIX, NSIS64, IFW) install every component with their own CMAKE_INSTALL_PREFIX
-          # directory and since deployqt.py needs the path to IDE_APP_TARGET the line below is needeed
+          # directory and since deploy.py needs the path to IDE_APP_TARGET the line below is needeed
           string(REPLACE \"Dependencies\" \"${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}\" _ide_app_target \"\${_ide_app_target}\")
         endif()
         if (NOT EXISTS \"\${_ide_app_target}\")
@@ -41,7 +41,8 @@ function(setup_dependencies_component)
         endif()
         execute_process(COMMAND
           \"${Python3_EXECUTABLE}\"
-          \"${CMAKE_CURRENT_LIST_DIR}/scripts/deployqt.py\"
+          \"-u\"
+          \"${CMAKE_CURRENT_LIST_DIR}/scripts/deploy.py\"
           ${_llvm_arg}
           ${_elfutils_arg}
           \"\${_ide_app_target}\"

coin/instructions/build.yaml

@@ -16,7 +16,7 @@ instructions:
         maxTimeBetweenOutput: 360
         userMessageOnFailure: "Failed to extract elfutils package, check logs."
       - type: ExecuteCommand
-        command: "curl --fail -L --retry 5 --retry-delay 5 -o {{.AgentWorkingDir}}/build/qt_temp/libclang.7z {{.Env.LLVM_BASE_URL}}-linux-Rhel8.2-gcc9.2-x86_64.7z"
+        command: "curl --fail -L --retry 5 --retry-delay 5 -o {{.AgentWorkingDir}}/build/qt_temp/libclang.7z {{.Env.LLVM_BASE_URL}}-linux-Rhel8.4-gcc10.3-x86_64.7z"
         maxTimeInSeconds: 3600
         maxTimeBetweenOutput: 360
         userMessageOnFailure: "Failed to download LLVM package, check logs."

coin/instructions/common_environment.yaml

@@ -7,10 +7,10 @@ instructions:
         variableValue: "RelWithDebInfo"
       - type: EnvironmentVariable
         variableName: LLVM_BASE_URL
-        variableValue: https://ci-files02-hki.ci.qt.io/packages/jenkins/qtcreator_libclang/libclang-release_16.0.2-based
+        variableValue: https://ci-files02-hki.ci.qt.io/packages/jenkins/qtcreator_libclang/libclang-release_17.0.1-based
       - type: EnvironmentVariable
         variableName: QTC_QT_BASE_URL
-        variableValue: "https://ci-files02-hki.ci.qt.io/packages/jenkins/archive/qt/6.5/6.5.2-released/Qt"
+        variableValue: "https://ci-files02-hki.ci.qt.io/packages/jenkins/archive/qt/6.6/6.6.0-released/Qt"
       - type: EnvironmentVariable
         variableName: QTC_QT_MODULES
         variableValue: "qt5compat qtbase qtdeclarative qtimageformats qtquick3d qtquickcontrols2 qtquicktimeline qtserialport qtshadertools qtsvg qttools qttranslations qtwebengine"
@@ -39,7 +39,7 @@ instructions:
         instructions:
           - type: EnvironmentVariable
             variableName: QTC_QT_POSTFIX
-            variableValue: "-Linux-RHEL_8_4-GCC-Linux-RHEL_8_4-X86_64.7z"
+            variableValue: "-Linux-RHEL_8_6-GCC-Linux-RHEL_8_6-X86_64.7z"
           - type: EnvironmentVariable
             variableName: QTC_SDKTOOL_QT_EXT
             variableValue: ".tar.xz"

dist/changelog/changes-11.0.3.md

@@ -0,0 +1,123 @@
+Qt Creator 11.0.3
+=================
+
+Qt Creator version 11.0.3 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/v11.0.2..v11.0.3
+
+Editing
+-------
+
+### C++
+
+* Fixed a crash with constructs that look similar to a function with initializer
+  ([QTCREATORBUG-29386](https://bugreports.qt.io/browse/QTCREATORBUG-29386))
+* Fixed an issue with Clang headers
+  ([QTCREATORBUG-29571](https://bugreports.qt.io/browse/QTCREATORBUG-29571))
+* Fixed missing lightbulbs for Clangd refactoring actions
+  ([QTCREATORBUG-29493](https://bugreports.qt.io/browse/QTCREATORBUG-29493))
+
+### QML
+
+* Fixed wrong M16 warnings
+  ([QTCREATORBUG-28468](https://bugreports.qt.io/browse/QTCREATORBUG-28468))
+
+### Language Server Protocol
+
+* Fixed the loading of client settings
+  ([QTCREATORBUG-29477](https://bugreports.qt.io/browse/QTCREATORBUG-29477))
+
+Projects
+--------
+
+* Fixed that issue descriptions were cut off
+  ([QTCREATORBUG-29458](https://bugreports.qt.io/browse/QTCREATORBUG-29458))
+* Fixed an issue when running in terminal
+  ([QTCREATORBUG-29503](https://bugreports.qt.io/browse/QTCREATORBUG-29503))
+
+### CMake
+
+* Fixed a crash when loading a project
+  ([QTCREATORBUG-29587](https://bugreports.qt.io/browse/QTCREATORBUG-29587))
+* Fixed that `Stage for installation` was enabled by default for iOS Simulator
+  and Bare Metal configurations
+  ([QTCREATORBUG-29293](https://bugreports.qt.io/browse/QTCREATORBUG-29293),
+   [QTCREATORBUG-29475](https://bugreports.qt.io/browse/QTCREATORBUG-29475))
+* Fixed adding and removing files from modified CMake files
+  ([QTCREATORBUG-29550](https://bugreports.qt.io/browse/QTCREATORBUG-29550))
+
+### qmake
+
+* Fixed the ABI setting in the qmake build step
+  ([QTCREATORBUG-29552](https://bugreports.qt.io/browse/QTCREATORBUG-29552))
+
+### Python
+
+* Fixed that `.pyw` files were missing from the target information
+
+Debugging
+---------
+
+* Fixed the debugging in terminal
+  ([QTCREATORBUG-29463](https://bugreports.qt.io/browse/QTCREATORBUG-29463),
+   [QTCREATORBUG-29497](https://bugreports.qt.io/browse/QTCREATORBUG-29497),
+   [QTCREATORBUG-29554](https://bugreports.qt.io/browse/QTCREATORBUG-29554))
+* Improved the pretty printer of `std::string` for `libc++`
+  ([QTCREATORBUG-29526](https://bugreports.qt.io/browse/QTCREATORBUG-29526))
+
+Analyzer
+--------
+
+### CTF Visualizer
+
+* Fixed a crash when loading invalid JSON
+
+Terminal
+--------
+
+* Fixed the default environment variables
+  ([QTCREATORBUG-29515](https://bugreports.qt.io/browse/QTCREATORBUG-29515))
+* Fixed `gnome-terminal` and `xdg-terminal` for the external terminal
+  ([QTCREATORBUG-29488](https://bugreports.qt.io/browse/QTCREATORBUG-29488))
+
+Test Integration
+----------------
+
+### CTest
+
+* Fixed the update of target information after a change in the kit
+  ([QTCREATORBUG-29477](https://bugreports.qt.io/browse/QTCREATORBUG-29477))
+
+Platforms
+---------
+
+### Remote Linux
+
+* Fixed that SFTP was used (and failed) for deployment when the source is remote
+  ([QTCREATORBUG-29524](https://bugreports.qt.io/browse/QTCREATORBUG-29524))
+* Fixed deployment to the device root directory
+  ([QTCREATORBUG-29597](https://bugreports.qt.io/browse/QTCREATORBUG-29597))
+
+### Docker
+
+* Fixed the registration of sysroots by the installer
+  ([QTCREATORBUG-29523](https://bugreports.qt.io/browse/QTCREATORBUG-29523))
+
+Credits for these changes go to:
+--------------------------------
+Alessandro Portale  
+Alexandre Laurent  
+André Pönitz  
+Christian Kandeler  
+Christian Stenger  
+Cristian Adam  
+David Schulz  
+Eike Ziller  
+Marcus Tillmanns  
+Miikka Heikkinen  
+Semih Yavuz  

dist/changelog/changes-12.0.0.md

@@ -0,0 +1,395 @@
+Qt Creator 12
+=============
+
+Qt Creator version 12 contains bug fixes and new features.
+
+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/11.0..v12.0.0
+
+What's new?
+-----------
+
+* Integrated [Compiler Explorer (https://godbolt.org)](https://godbolt.org)
+* CMake debugging and the [Debug Adapter Protocol](https://microsoft.github.io/debug-adapter-protocol/)
+* Screen recording
+
+### Compiler Explorer
+
+Use [Compiler Explorer (https://godbolt.org)](https://godbolt.org) in Qt Creator
+and enter example code to explore the capabilities of your compilers and
+interpreters.
+
+To enable the CompilerExplorer plugin, select
+`Help > About Plugins > Utilities > CompilerExplorer`. Then select
+`Restart Now` to restart Qt Creator and load the plugin.
+
+Select `File > New File` and select one of the new `Compiler Explorer` templates
+to get started.
+
+Alternatively, you can open a new `Compiler Explorer` editor via
+`Tools > Compiler Explorer > Open Compiler Explorer`.
+
+Every language, compiler, and library that is supported at <https://godbolt.org>
+is also supported in Qt Creator. You can save your Compiler Explorer session as
+a `.qtce` file (JSON-based).
+
+([Documentation](https://doc-snapshots.qt.io/qtcreator-12.0/creator-how-to-explore-compiler-code.html))
+
+### CMake Debugging and the Debug Adapter Protocol
+
+Set breakpoints in a CMake file and select
+`Debug > Start Debugging > Start CMake Debugging` to start debugging.
+
+([Documentation](https://doc-snapshots.qt.io/qtcreator-12.0/creator-how-to-debug-cmake-files.html))
+
+
+### Screen Recording
+
+Use `Tools > Record Screen` to record a part of your screen. Requires an
+installation of [FFmpeg](https://ffmpeg.org).
+
+To enable the ScreenRecorder plugin, select
+`Help > About Plugins > Utilities > ScreenRecorder`. Then select
+`Restart Now` to restart Qt Creator and load the plugin.
+
+([Documentation](https://doc-snapshots.qt.io/qtcreator-12.0/creator-how-to-record-screens.html))
+
+General
+-------
+
+* Improved the startup performance significantly on various setups
+* Added the `Sort results` check box for configuring the `md` locator filter in
+  `Edit > Preferences > Environment > Locator` to keep the sorting from the tool
+  used for the file system index locator filter
+  ([QTCREATORBUG-27789](https://bugreports.qt.io/browse/QTCREATORBUG-27789))
+  ([Documentation](https://doc-snapshots.qt.io/qtcreator-12.0/creator-editor-locator.html#locating-files-from-global-file-system-index))
+* Added the `View > Show Menu Bar` option to hide the menu bar on platforms
+  without a unified menu bar
+  ([QTCREATORBUG-29498](https://bugreports.qt.io/browse/QTCREATORBUG-29498))
+  ([Documentation](https://doc-snapshots.qt.io/qtcreator-12.0/creator-how-to-show-and-hide-main-menu.html))
+* Changed the `Enable high DPI scaling` setting to a `DPI rounding policy`
+  setting, which fits Qt's settings better
+  ([Documentation](https://doc-snapshots.qt.io/qtcreator-12.0/creator-how-to-set-high-dpi-scaling.html))
+* Fixed an issue with growing session files
+* Fixed that the shortcuts for the navigation views could be stuck to opening a
+  view in the right side bar
+  ([QTCREATORBUG-29770](https://bugreports.qt.io/browse/QTCREATORBUG-29770))
+* Fixed that the shortcut for Locator switched to the main window
+  ([QTCREATORBUG-29741](https://bugreports.qt.io/browse/QTCREATORBUG-29741))
+
+Help
+----
+
+* Added the `Edit > Preferences > Help > General > Antialias` check box for
+  setting the anti-aliasing of text
+  ([QTCREATORBUG-12177](https://bugreports.qt.io/browse/QTCREATORBUG-12177))
+  ([Documentation](https://doc-snapshots.qt.io/qtcreator-12.0/creator-how-to-get-help.html#change-the-font))
+
+Editing
+-------
+
+* Added the count of selected characters to line and column information
+  on the `Edit` mode toolbar
+  ([QTCREATORBUG-29381](https://bugreports.qt.io/browse/QTCREATORBUG-29381))
+  ([Documentation](https://doc-snapshots.qt.io/qtcreator-12.0/creator-coding-navigating.html#navigating-between-open-files-and-symbols))
+* Added an indenter, auto-brace and auto-quote for JSON
+  ([Documentation](https://doc-snapshots.qt.io/qtcreator-12.0/creator-enclose-code-in-characters.html))
+* Improved the performance of searching in big documents
+* Fixed that the historical order of open documents was not restored
+* Fixed that suggestions were rendered with the wrong tab size
+  ([QTCREATORBUG-29483](https://bugreports.qt.io/browse/QTCREATORBUG-29483))
+
+### C++
+
+* Updated to LLVM 17.0.1
+* Added `Tools > C++ > Fold All Comment Blocks` and `Unfold All Comment Blocks`
+  ([QTCREATORBUG-2449](https://bugreports.qt.io/browse/QTCREATORBUG-2449))
+  ([Documentation](https://doc-snapshots.qt.io/qtcreator-12.0/creator-highlighting.html#folding-blocks))
+* Added the `Convert Comment to C Style` and `Convert Comment to C++ Style`
+  refactoring actions for converting comments between C++-style and
+  C-style
+  ([QTCREATORBUG-27501](https://bugreports.qt.io/browse/QTCREATORBUG-27501))
+  ([Documentation](https://doc-snapshots.qt.io/qtcreator-12.0/creator-editor-quick-fixes.html#refactoring-c-code))
+* Added the `Move Function Documentation to Declaration` and
+  `Move Function Documentation to Definition` refactoring actions for moving
+  documentation between function declaration and definition
+  ([QTCREATORBUG-13877](https://bugreports.qt.io/browse/QTCREATORBUG-13877))
+* Extended the application of renaming operations to documentation comments
+  ([QTCREATORBUG-12051](https://bugreports.qt.io/browse/QTCREATORBUG-12051),
+   [QTCREATORBUG-15425](https://bugreports.qt.io/browse/QTCREATORBUG-15425))
+* Fixed that code inserted by refactoring actions was not formatted according
+  to the Clang Format settings
+  ([QTCREATORBUG-10807](https://bugreports.qt.io/browse/QTCREATORBUG-10807),
+   [QTCREATORBUG-19158](https://bugreports.qt.io/browse/QTCREATORBUG-19158))
+* Fixed that automatically created functions could be added between another
+  function and its documentation
+  ([QTCREATORBUG-6934](https://bugreports.qt.io/browse/QTCREATORBUG-6934))
+* Fixed that scope names were considered when searching for `C++ Symbols` with
+  advanced find
+  ([QTCREATORBUG-29133](https://bugreports.qt.io/browse/QTCREATORBUG-29133))
+* Clangd
+    * Added the `Completion ranking model` option for choosing the order of
+      completion results
+      ([QTCREATORBUG-29013](https://bugreports.qt.io/browse/QTCREATORBUG-29013))
+    * Fixed that the refactoring actions from Clangd were not available in the
+      context menu
+    * Fixed that renaming symbols could rename them in generated files
+      ([QTCREATORBUG-29778](https://bugreports.qt.io/browse/QTCREATORBUG-29778))
+* Clang Format
+    * Fixed the style settings for Clang Format 16 and later
+      ([QTCREATORBUG-29434](https://bugreports.qt.io/browse/QTCREATORBUG-29434))
+
+### QML
+
+* Fixed invalid `M325` warnings
+  ([QTCREATORBUG-29601](https://bugreports.qt.io/browse/QTCREATORBUG-29601))
+* Language Server
+    * Fixed the shortcut for applying refactoring actions
+      ([QTCREATORBUG-29557](https://bugreports.qt.io/browse/QTCREATORBUG-29557))
+
+### Python
+
+* Fixed duplicate code when renaming
+  ([QTCREATORBUG-29389](https://bugreports.qt.io/browse/QTCREATORBUG-29389))
+
+### Language Server Protocol
+
+* Added support for Language servers that request creating, renaming, or deleting
+  of files
+  ([QTCREATORBUG-29542](https://bugreports.qt.io/browse/QTCREATORBUG-29542))
+
+### Widget Designer
+
+* Fixed that renaming layouts in the property editor switched to edit mode
+  ([QTCREATORBUG-29644](https://bugreports.qt.io/browse/QTCREATORBUG-29644))
+
+### Copilot
+
+* Added support for proxies
+  ([QTCREATORBUG-29485](https://bugreports.qt.io/browse/QTCREATORBUG-29485))
+  ([Documentation](https://doc-snapshots.qt.io/qtcreator-12.0/creator-copilot.html))
+* Fixed the auto-detection of `agent.js`
+  ([QTCREATORBUG-29750](https://bugreports.qt.io/browse/QTCREATORBUG-29750))
+
+### TODO
+
+* Added the `\todo` keyword to the default
+
+### Markdown
+
+* Added buttons and configurable shortcuts for text styles
+  ([Documentation](https://doc-snapshots.qt.io/qtcreator-12.0/creator-markdown-editor.html))
+
+### Images
+
+* Fixed that animations could not be restarted
+  ([QTCREATORBUG-29606](https://bugreports.qt.io/browse/QTCREATORBUG-29606))
+* Fixed that looping animations did not loop
+  ([QTCREATORBUG-29606](https://bugreports.qt.io/browse/QTCREATORBUG-29606))
+
+Projects
+--------
+
+* Project specific settings
+    * Added C++ file naming settings
+      ([QTCREATORBUG-22033](https://bugreports.qt.io/browse/QTCREATORBUG-22033))
+      ([Documentation](https://doc-snapshots.qt.io/qtcreator-12.0/creator-how-to-set-cpp-file-naming.html))
+    * Added documentation comment settings
+      ([Documentation](https://doc-snapshots.qt.io/qtcreator-12.0/creator-how-to-document-code.html))
+* Added an option for the Doxygen command prefix
+  ([QTCREATORBUG-8096](https://bugreports.qt.io/browse/QTCREATORBUG-8096))
+* Improved performance of filtering the target setup page
+  ([QTCREATORBUG-29494](https://bugreports.qt.io/browse/QTCREATORBUG-29494))
+* Fixed that run configurations were removed when the corresponding target
+  vanishes (even temporarily)
+  ([QTCREATORBUG-23163](https://bugreports.qt.io/browse/QTCREATORBUG-23163),
+   [QTCREATORBUG-28273](https://bugreports.qt.io/browse/QTCREATORBUG-28273))
+* Fixed issues with recursive symbolic links
+  ([QTCREATORBUG-29663](https://bugreports.qt.io/browse/QTCREATORBUG-29663))
+
+### CMake
+
+* Removed support for extra generators
+* Added `Follow Symbol Under Cursor` for functions, macros, targets and packages
+  ([QTCREATORBUG-25523](https://bugreports.qt.io/browse/QTCREATORBUG-25523),
+   [QTCREATORBUG-25524](https://bugreports.qt.io/browse/QTCREATORBUG-25524))
+* Added support for `CMAKE_SOURCE_DIR` and similar variables for
+  `Jump to File Under Cursor`
+  ([QTCREATORBUG-29467](https://bugreports.qt.io/browse/QTCREATORBUG-29467))
+* Added code completion for various aspects of CMake (local functions and
+  variables, cache variables, `ENV`, targets, packages, variables added by
+  `find_package`)
+* Added support for `CMAKE_UNITY_BUILD`
+  ([QTCREATORBUG-23635](https://bugreports.qt.io/browse/QTCREATORBUG-23635),
+   [QTCREATORBUG-26822](https://bugreports.qt.io/browse/QTCREATORBUG-26822),
+   [QTCREATORBUG-29080](https://bugreports.qt.io/browse/QTCREATORBUG-29080))
+* Added support for `cmake-format` configuration files
+  ([QTCREATORBUG-28969](https://bugreports.qt.io/browse/QTCREATORBUG-28969))
+* Added help tooltips
+  ([QTCREATORBUG-25780](https://bugreports.qt.io/browse/QTCREATORBUG-25780))
+* Extended context help for variables, properties and modules
+* Improved performance when switching sessions
+  ([QTCREATORBUG-27729](https://bugreports.qt.io/browse/QTCREATORBUG-27729))
+* Fixed issues with the subdirectory structure of the project tree
+  ([QTCREATORBUG-23942](https://bugreports.qt.io/browse/QTCREATORBUG-23942),
+   [QTCREATORBUG-29105](https://bugreports.qt.io/browse/QTCREATORBUG-29105))
+* Presets
+    * Fixed that variables were not expanded for `cmakeExecutable`
+      ([QTCREATORBUG-29643](https://bugreports.qt.io/browse/QTCREATORBUG-29643))
+    * Fixed unnecessary restrictions on the preset name
+
+([Documentation](https://doc-snapshots.qt.io/qtcreator-12.0/creator-project-cmake.html))
+
+### Python
+
+* Added auto-detection of PySide from the installer
+  ([PYSIDE-2153](https://bugreports.qt.io/browse/PYSIDE-2153))
+  ([Documentation](https://doc-snapshots.qt.io/qtcreator-12.0/creator-python-development.html#set-up-pyside6))
+* Added the option to forward the display for remote Linux
+  ([Documentation](https://doc-snapshots.qt.io/qtcreator-12.0/creator-run-settings.html#specifying-run-settings-for-linux-based-devices))
+* Fixed PySide wheels installation on macOS
+
+### qmake
+
+* Fixed the project tree structure in case of some subfolder structures
+  ([QTCREATORBUG-29733](https://bugreports.qt.io/browse/QTCREATORBUG-29733))
+
+### vcpkg
+
+* Added the generation of code for `CMakeLists.txt`
+* Added parsing the dependencies from `vcpkg.json` manifest files
+* Improved the addition of dependencies to `vcpkg.json`
+
+### Qt Safe Renderer
+
+* Added a wizard for Qt Safe Renderer 2.1 and later
+  ([Documentation](https://doc.qt.io/QtSafeRenderer/qtsr-safety-project.html#using-qt-safe-renderer-project-template-in-qt-creator))
+
+Debugging
+---------
+
+### C++
+
+* Added support for remote Linux debugging with LLDB
+* Fixed warnings about index cache permissions
+  ([QTCREATORBUG-29556](https://bugreports.qt.io/browse/QTCREATORBUG-29556))
+
+Analyzer
+--------
+
+### Clang
+
+* Fixed that error messages were not shown
+  ([QTCREATORBUG-29298](https://bugreports.qt.io/browse/QTCREATORBUG-29298))
+* Fixed that `-mno-direct-extern-access` could be passed to `clang-tidy` which
+  does not support it
+
+### CTF Visualizer
+
+* Fixed that process and thread IDs could not be strings
+* Fixed the computation of nesting levels
+* Fixed a crash when zooming with a touch pad
+
+Terminal
+--------
+
+* Added mouse support
+* Added support for Windows Terminal schemes
+* Fixed `Ctrl+C/V` on Windows
+
+([Documentation](https://doc-snapshots.qt.io/qtcreator-12.0/creator-reference-terminal-view.html))
+
+Version Control Systems
+-----------------------
+
+### Git
+
+* Added the `Ignore whitespace changes` and `Ignore line moves` options to
+  `Preferences >  Version Control > Git > Instant Blame`
+  ([QTCREATORBUG-29378](https://bugreports.qt.io/browse/QTCREATORBUG-29378))
+  ([Documentation](https://doc-snapshots.qt.io/qtcreator-12.0/creator-vcs-git.html))
+
+### CVS
+
+* Disabled by default
+
+Test Integration
+----------------
+
+* Added an option for the number of threads used for scanning
+  ([QTCREATORBUG-29301](https://bugreports.qt.io/browse/QTCREATORBUG-29301))
+* Improved the wizards for `GTest` and `Catch2`
+
+Platforms
+---------
+
+### Android
+
+* Fixed issues when `LIBRARY_OUTPUT_DIRECTORY` is set in the CMake build files
+  ([QTCREATORBUG-26479](https://bugreports.qt.io/browse/QTCREATORBUG-26479))
+
+### iOS
+
+* Known Issue: iOS 17 devices are not supported
+
+### Docker
+
+* Fixed the check for commands that are built-ins of the shell
+
+Credits for these changes go to:
+--------------------------------
+Aleksei German  
+Alessandro Portale  
+Ali Kianian  
+Amr Essam  
+Andre Hartmann  
+André Pönitz  
+Andreas Loth  
+Artem Sokolovskii  
+Brook Cronin  
+Burak Hancerli  
+Christian Kandeler  
+Christian Stenger  
+Cristian Adam  
+David Schulz  
+Dominic Ernst  
+Eike Ziller  
+Esa Törmänen  
+Friedemann Kleint  
+Henning Gruendl  
+Jaroslaw Kobus  
+Johanna Vanhatapio  
+Johnny Jazeix  
+Jonas Karlsson  
+Jussi Witick  
+Knud Dollereder  
+Leena Miettinen  
+Ludovic Le Brun  
+Mahmoud Badri  
+Marco Bubke  
+Marcus Tillmanns  
+Mats Honkamaa  
+Mehdi Salem  
+Miikka Heikkinen  
+Olivier De Cannière  
+Olivier Delaune  
+Orgad Shaneh  
+Pranta Dastider  
+Robert Löhning  
+Sami Shalayel  
+Samuel Ghinet  
+Samuli Piippo  
+Semih Yavuz  
+Tasuku Suzuki  
+Thiago Macieira  
+Thomas Hartmann  
+Tim Jenssen  
+Tim Jenßen  
+Tor Arne Vestbø  
+Vikas Pachdha  
+Xavier Besson  
+Yasser Grimes  

dist/installer/mac/README.md

@@ -0,0 +1,8 @@
+This folder contains various files used to build the Mac installer.
+
+# Entitlements
+
+The entitlements here will be picked up by [scripts/build.py](../../../scripts/build.py)
+via [scripts/common.py](../../../scripts/common.py) `codesign_executable()` based on their name.
+If you need a new application to be signed with specific entitlements, you can simply add a file
+called `your-app-name.entitlements` to this folder.

dist/installer/mac/ios_qt.conf

@@ -1,2 +0,0 @@
-[Paths]
-Plugins = ../../../PlugIns

dist/installer/mac/libexec_qt.conf

@@ -1,5 +0,0 @@
-[Paths]
-Prefix = ../..
-Imports = Imports/qtquick1
-Qml2Imports = Imports/qtquick2
-Plugins = PlugIns

dist/installer/mac/qt.conf

@@ -1,4 +0,0 @@
-[Paths]
-Binaries = MacOS
-Qml2Imports = Imports/qtquick2
-Plugins = PlugIns

doc/config/macros.qdocconf

@@ -39,6 +39,7 @@ macro.QOI               = "Qt Online Installer"
 macro.QMT               = "Qt Maintenance Tool"
 macro.qtcversion        = $QTC_VERSION
 macro.param             = "\\e"
+macro.preferences       = "\\l{Find preferences}{Preferences}"
 macro.raisedaster.HTML  = "<sup>*</sup>"
 macro.rarrow.HTML       = "&rarr;"
 macro.reg.HTML          = "<sup>&reg;</sup>"

doc/qtcreator/config/qtcreator-project.qdocconf

@@ -34,6 +34,7 @@ depends +=    qtwidgets \
               qthelp \
               qtquicktimeline \
               qtlinguist \
+              qtpositioning \
               qtscxml \
               qtsensors \
               qttestlib \

doc/qtcreator/config/style/qt5-sidebar.html

@@ -81,31 +81,34 @@
 </div>
 <div class="sectionlist normallist">
     <div class="heading">
-        <h2>Advanced Use</h2>
+        <h2>How To</h2>
     </div>
     <ul>
-        <li><a href="creator-os-supported-platforms.html">Supported Platforms</a></li>
-        <li><a href="creator-project-other.html">Build Systems</a></li>
-        <li><a href="creator-cli.html">Using Command Line Options</a></li>
-        <li><a href="creator-keyboard-shortcuts.html">Keyboard Shortcuts</a></li>
-        <li><a href="creator-editor-external.html">Using External Tools</a></li>
-        <li><a href="creator-task-lists.html">Showing Task List Files in Issues</a></li>
-        <li><a href="creator-logging-viewer.html">Inspecting Internal Logs</a></li>
-        <li><a href="creator-telemetry.html">Managing Data Collection</a></li>
+        <li><a href="creator-how-tos.html#design-uis">Design UIs</a></li>
+        <li><a href="creator-how-tos.html#edit-code">Edit Code</a></li>
+        <li><a href="creator-how-tos.html#manage-projects">Manage Projects</a></li>
+        <li><a href="creator-how-tos.html#build-and-run">Build and Run</a></li>
+        <li><a href="creator-how-tos.html#read-qt-documentation">Read Qt Documentation</a></li>
+        <li><a href="creator-how-tos.html#use-qt-creator">Use Qt Creator</a></li>
+        <li><a href="creator-how-tos.html#use-the-ui">Use the UI</a></li>
+        <li><a href="creator-how-tos.html">See All</a></li>
     </ul>
 </div>
 <div class="sectionlist normallist">
     <div class="heading">
-        <h2>Getting Help</h2>
+        <h2>Reference</h2>
     </div>
     <ul>
-        <li><a href="creator-help.html">Using the Help Mode</a></li>
-        <li><a href="creator-faq.html">FAQ</a></li>
-        <li><a href="creator-how-tos.html">How-to</a></li>
-        <li><a href="creator-reference.html">Reference</a></li>
-        <li><a href="creator-known-issues.html">Known Issues</a></li>
-        <li><a href="creator-glossary.html">Glossary</a></li>
-        <li><a href="technical-support.html">Technical Support</a></li>
         <li><a href="creator-acknowledgements.html">Acknowledgements</a></li>
+        <li><a href="creator-project-other.html">Build Systems</a></li>
+        <li><a href="creator-cli.html">Command-Line Options</a></li>
+        <li><a href="creator-project-wizards.html">Custom Wizards</a></li>
+        <li><a href="creator-faq.html">FAQ</a></li>
+        <li><a href="creator-glossary.html">Glossary</a></li>
+        <li><a href="creator-keyboard-shortcuts.html">Keyboard Shortcuts</a></li>
+        <li><a href="creator-known-issues.html">Known Issues</a></li>
+        <li><a href="creator-os-supported-platforms.html">Supported Platforms</a></li>
+        <li><a href="technical-support.html">Technical Support</a></li>
+        <li><a href="creator-reference.html">See All</a></li>
     </ul>
 </div>

doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc

@@ -104,7 +104,7 @@
     \section1 Specifying Performance Analyzer Settings
 
     To specify global settings for the Performance Analyzer, select
-    \uicontrol Edit > \uicontrol Preferences > \uicontrol Analyzer >
+    \preferences > \uicontrol Analyzer >
     \uicontrol {CPU Usage}. For each run configuration, you can also
     use specialized settings. Select \uicontrol Projects > \uicontrol Run, and
     then select \uicontrol Details next to
@@ -219,9 +219,9 @@
     snapshots may fail to capture call chains of highly recursive applications
     or other intense stack usage.
 
-    \section2 Adding Command Line Options For Perf
+    \section2 Adding Command-Line Options for Perf
 
-    You can specify additional command line options to be passed to Perf when
+    You can specify additional command-line options to be passed to Perf when
     recording data in the \uicontrol {Additional arguments} field. You may want
     to specify \c{--no-delay} or \c{--no-buffering} to reduce the processing
     delay. However, those options are not supported by all versions of Perf and

doc/qtcreator/src/analyze/creator-axivion.qdoc

@@ -25,6 +25,8 @@
     The experimental Axivion plugin integrates the Axivion dashboard server into
     \QC.
 
+    \note Enable the Axivion plugin to use it.
+
     To use the plugin, you must set up a project in the Axivion dashboard
     server and link to it from \QC. You can then see style violations in the
     \uicontrol Edit mode and descriptions and issue counts in the
@@ -44,22 +46,12 @@
     To view the issue counts, select \inlineimage icons/home.png
     (\uicontrol {Show Dashboard}).
 
-    \section1 Enabling the Axivion Plugin
-
-    To enable the Axivion plugin:
-
-    \list 1
-        \li Select \uicontrol Help > \uicontrol {About Plugins} >
-            \uicontrol {Code Analyzer} > \uicontrol Axivion to enable the plugin.
-        \li Select \uicontrol {Restart Now} to restart \QC and load the plugin.
-    \endlist
-
     \section1 Connecting to Axivion Dashboard Servers
 
     To connect to Axivion:
 
     \list 1
-        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Axivion.
+        \li Select \preferences > \uicontrol Axivion.
             \image qtcreator-preferences-axivion.webp {General tab in Axivion Preferences}
         \li Select \uicontrol Edit to create a connection to the Axivion
             dashboard server.
@@ -106,4 +98,6 @@
 
     To clear the view, select \inlineimage icons/clean_pane_small.png
     (\uicontrol Clear).
+
+    \sa {Enable and disable plugins}
 */

doc/qtcreator/src/analyze/creator-clang-static-analyzer.qdoc

@@ -111,7 +111,7 @@
 
     \list 1
 
-        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Analyzer >
+        \li Select \preferences > \uicontrol Analyzer >
             \uicontrol {Clang Tools}.
 
             \image qtcreator-clang-tools-options.png {Clang Tools preferences}

doc/qtcreator/src/analyze/creator-coco.qdoc

@@ -42,15 +42,7 @@
 
     To use the plugin, you must download and install Coco.
 
-    \section1 Enabling the Coco Plugin
-
-    To enable the Coco plugin:
-
-    \list 1
-        \li Select \uicontrol Help > \uicontrol {About Plugins} >
-            \uicontrol Utilities > \uicontrol Coco to enable the plugin.
-        \li Select \uicontrol {Restart Now} to restart \QC and load the plugin.
-    \endlist
+    \note Enable the Coco plugin to use it.
 
     \section1 Configuring Coco
 
@@ -75,8 +67,8 @@
 
     \section1 Changing Fonts and Colors
 
-    To change the default fonts and colors, select \uicontrol Edit >
-    \uicontrol Preferences > \uicontrol {Text Editor} > \uicontrol {Font & Colors}.
+    To change the default fonts and colors, select \preferences >
+    \uicontrol {Text Editor} > \uicontrol {Font & Colors}.
     Create your own color scheme and select new fonts and colors for the
     following results:
 
@@ -93,5 +85,5 @@
         \li Implicit Manual Coverage Validation
     \endlist
 
-    For more information, see \l{Specifying Text Editor Settings}.
+    \sa {Enable and disable plugins}, {Specifying Text Editor Settings}
 */

doc/qtcreator/src/analyze/creator-cppcheck.qdoc

@@ -15,20 +15,12 @@
     The experimental Cppcheck Diagnostics plugin integrates diagnostics
     that are generated by the Cppcheck tool into the C++ editor.
 
+    \note Enable the Cppcheck plugin to use it.
+
     Cppcheck is automatically run on open files. To select the files to
     check in the currently active project, select \uicontrol Analyze >
     \uicontrol Cppcheck.
 
-    \section1 Enabling the Cppcheck Plugin
-
-    To enable the Cppcheck plugin:
-
-    \list 1
-        \li Select \uicontrol Help > \uicontrol {About Plugins} >
-            \uicontrol {Code Analyzer} > \uicontrol Cppcheck to enable the
-            plugin.
-        \li Select \uicontrol {Restart Now} to restart \QC and load the plugin.
-    \endlist
 
     \section1 Running Cppcheck on Selected Files
 
@@ -72,6 +64,8 @@
     marks or annotations.
 
     To specify the settings above for the automatically run checks,
-    select \uicontrol Edit > \uicontrol Preferences > \uicontrol Analyzer
+    select \preferences > \uicontrol Analyzer
     > \uicontrol Cppcheck.
+
+    \sa {Enable and disable plugins}
 */

doc/qtcreator/src/analyze/creator-heob.qdoc

@@ -92,7 +92,7 @@
     In the \uicontrol {Handle exceptions} list, select \uicontrol Off to use the
     standard exception handler and have the debugger automatically attached if
     the application crashes. This works only if you register \QC is as a
-    post-mortem debugger by selecting \uicontrol Edit > \uicontrol Preferences >
+    post-mortem debugger by selecting \preferences >
     \uicontrol Debugger > \uicontrol General >
     \uicontrol {Use Qt Creator for post-mortem debugging}.
 

doc/qtcreator/src/analyze/creator-valgrind-overview.qdoc

@@ -36,8 +36,8 @@
     For more information about analyzing applications for which you do not have
     a project, see \l{Running Valgrind Tools on External Applications}.
 
-    To set preferences for the Valgrind tools, select \uicontrol Edit >
-    \uicontrol Preferences > \uicontrol Analyzer. You can override the general
+    To set preferences for the Valgrind tools, select \preferences >
+    \uicontrol Analyzer. You can override the general
     settings for each project in the \uicontrol {Run Settings} for the project.
 
     The following sections describe how to use the Valgrind tools:

doc/qtcreator/src/analyze/creator-valgrind.qdoc

@@ -81,18 +81,17 @@
     separately for each project in the \l{Specifying Run Settings}{run settings}
     of the project.
 
-    To specify global settings for Valgrind, select \uicontrol Edit >
-    \uicontrol Preferences > \uicontrol Analyzer. The \uicontrol
-    {Memcheck Memory Analysis Options} group has Memcheck options.
+    To specify global settings for Valgrind, select \preferences >
+    \uicontrol Analyzer. The \uicontrol {Memcheck Memory Analysis Options}
+    group has Memcheck options.
 
     In \uicontrol {Extra Memcheck arguments}, specify additional arguments
     for launching the executable.
 
     Stack traces can get quite large and confusing, and therefore, reading them
     from the bottom up can help. If the stack trace is not big enough or it is
-    too big, select \uicontrol Edit > \uicontrol Preferences > \uicontrol Analyzer
-    and define the length of the stack trace in the
-    \uicontrol {Backtrace frame count} field.
+    too big, select \preferences > \uicontrol Analyzer and define the length of
+    the stack trace in the \uicontrol {Backtrace frame count} field.
 
     \image qtcreator-valgrind-memcheck-options.png "Memory Analysis options"
 
@@ -268,9 +267,9 @@
     separately for each project in the \l{Specifying Run Settings}{run settings}
     of the project.
 
-    To specify global settings for Valgrind, select \uicontrol Edit >
-    \uicontrol Preferences > \uicontrol Analyzer. The \uicontrol
-    {Callgrind Profiling Options} group has Callgrind options.
+    To specify global settings for Valgrind, select \preferences >
+    \uicontrol Analyzer. The \uicontrol {Callgrind Profiling Options}
+    group has Callgrind options.
 
     \image qtcreator-valgrind-callgrind-options.png "Valgrind options"
 
@@ -324,6 +323,7 @@
 
     \endlist
 
+    \sa {Detach views}
 */
 
 /*!

doc/qtcreator/src/android/androiddev.qdoc

@@ -21,7 +21,7 @@
     highlighting, function tooltips, and navigating in code, add a
     \l{Java Language Server}{Java language server}.
 
-    \QC integrates the Android Debug Bridge (\c adb) command line tool for
+    \QC integrates the Android Debug Bridge (\c adb) command-line tool for
     deploying applications to Android devices, running them, and reading their
     logs. The \c adb tool includes a client and server that run on
     the development host and a daemon that runs on the emulator or device.
@@ -55,10 +55,7 @@
     To set up the development environment for Android:
 
     \list 1
-        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Devices >
-            \uicontrol Android on Windows and Linux or \uicontrol {\QC} >
-            \uicontrol Preferences > \uicontrol Devices > \uicontrol Android on
-            \macos.
+        \li Select \preferences > \uicontrol Devices > \uicontrol Android.
             \image qtcreator-options-android-main.png {Android preferences}
         \li In the \uicontrol {JDK location} field, set the path to the JDK.
             \QC checks the JDK installation and reports errors.
@@ -142,10 +139,8 @@
 
     \section2 Managing Android NDK Packages
 
-    To view the installed \l{Android NDK} versions, select \uicontrol Edit >
-    \uicontrol Preferences > \uicontrol Devices > \uicontrol Android on Windows and
-    Linux or \uicontrol {\QC} > \uicontrol Preferences > \uicontrol Devices >
-    \uicontrol Android on \macos.
+    To view the installed \l{Android NDK} versions, select \preferences >
+    \uicontrol Devices > \uicontrol Android.
 
     \image qtcreator-options-android-sdk-tools.png {Android NDK and SDK checks}
 
@@ -162,7 +157,7 @@
     To add custom NDK paths manually to the global list of NDKs, select
     \uicontrol Add. This creates custom tool chains and debuggers associated
     to that NDK. However, you have to manually create a kit that uses the
-    custom NDK. For more information, see \l{Adding Kits}.
+    custom NDK. For more information, see \l{Add kits}.
 
     \section2 Managing Android SDK Packages
 
@@ -172,11 +167,8 @@
     installing, updating, and removing SDK packages. You can still use
     \c sdkmanager for advanced SDK management.
 
-    To view the installed Android SDK packages, select \uicontrol Edit >
-    \uicontrol Preferences > \uicontrol Devices > \uicontrol Android >
-    \uicontrol {SDK Manager} on Windows and Linux or \uicontrol {\QC} >
-    \uicontrol Preferences > \uicontrol Devices > \uicontrol Android >
-    \uicontrol {SDK Manager} on \macos.
+    To view the installed Android SDK packages, select \preferences >
+    \uicontrol Devices > \uicontrol Android > \uicontrol {SDK Manager}.
 
     \image qtcreator-android-sdk-manager.webp {Android SDK Manager}
 
@@ -200,10 +192,8 @@
 
     \section1 Managing Android Virtual Devices (AVD)
 
-    To view the available AVDs, select \uicontrol Edit > \uicontrol Preferences
-    > \uicontrol Devices on Windows and Linux or \uicontrol {\QC} >
-    \uicontrol Preferences > \uicontrol Devices > on \macos. You can add more
-    AVDs.
+    To view the available AVDs, select \preferences > \uicontrol Devices.
+    You can add more AVDs.
 
     \image qtcreator-android-avd-manager.png {Android device in Devices}
 
@@ -239,10 +229,8 @@
     To create new virtual devices:
 
     \list 1
-        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Devices >
-            \uicontrol Add > \uicontrol {Android Device} on Windows and Linux
-            or \uicontrol {\QC} > \uicontrol Preferences > \uicontrol Devices >
-            \uicontrol Add > \uicontrol {Android Device} on \macos to open the
+        \li Select \preferences > \uicontrol Devices >
+            \uicontrol Add > \uicontrol {Android Device} to open the
             \uicontrol {Create New AVD} dialog.
             \image qtcreator-android-create-avd.png {Create New AVD dialog}
         \li Set the name, definition, architecture, target API level, and

doc/qtcreator/src/baremetal/creator-baremetal-dev.qdoc

@@ -54,23 +54,12 @@
     ST-Link and J-Link debug server providers can be used together with
     the \l {uVision IDE}.
 
-    \section1 Enabling the Bare Metal Device Plugin
-
-    To enable the Bare Metal Device plugin:
-
-    \list 1
-
-        \li Select \uicontrol Help > \uicontrol {About Plugins} >
-            \uicontrol {Device Support} > \uicontrol {Bare Metal}.
-
-        \li Select \uicontrol {Restart Now} to restart \QC and load the plugin.
-
-    \endlist
+    \note Enable the Bare Metal plugin to use it.
 
     \section1 Specifying Settings for Debug Server Providers
 
     To create connections to bare metal devices using a debug server provider,
-    select \uicontrol Edit > \uicontrol Preferences > \uicontrol Devices
+    select \preferences > \uicontrol Devices
     > \uicontrol {Bare Metal} > \uicontrol Add > \uicontrol Default.
     The available settings depend on the debug server provider.
 
@@ -251,7 +240,7 @@
 
         \list 1
 
-           \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Devices
+           \li Select \preferences > \uicontrol Devices
                 > \uicontrol Add > \uicontrol {Bare Metal Device} >
                 \uicontrol {Start Wizard}.
 
@@ -265,12 +254,14 @@
     \section1 Building for and Running on Bare Metal Devices
 
     To add a kit for building applications and running them on bare metal
-    devices, select \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits
-    > \uicontrol Add. For more information, see \l{Adding Kits}.
+    devices, select \preferences > \uicontrol Kits
+    > \uicontrol Add. For more information, see \l{Add kits}.
 
     \image qtcreator-baremetal-kit.png "Kit preferences for Bare Metal"
 
     You can build applications for and run them on bare metal devices
     in the same way as for and on the desktop. For more information, see
     \l{Building for Multiple Platforms} and \l{Running on Multiple Platforms}.
+
+    \sa {Enable and disable plugins}
 */