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

Conflicts: src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp
  src/plugins/qmldesigner/components/stateseditornew/stateseditorwidget.cpp
  tests/unit/unittest/qmlprojectmanager/projectitem-test.cpp

Change-Id: Icdb63851ec0162d82217e85b3beb0b6f9f12899e

2 files changed, 245 insertions, 62 deletions

diff --git a/dist/changelog/changes-10.0.2.md b/dist/changelog/changes-10.0.2.md
new file mode 100644
index 0000000000..baf99955de
--- /dev/null
+++ b/dist/changelog/changes-10.0.2.md
@@ -0,0 +1,76 @@
+Qt Creator 10.0.2
+=================
+
+Qt Creator version 10.0.2 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/v10.0.1..v10.0.2
+
+General
+-------
+
+* Fixed freezes due to excessive file watching (QTCREATORBUG-28957)
+
+Editing
+-------
+
+### C++
+
+* Fixed a crash when following symbols (QTCREATORBUG-28989)
+* Fixed the highlighting of raw string literals with empty lines
+  (QTCREATORBUG-29200)
+* Clang Format
+    * Fixed the editing of custom code styles (QTCREATORBUG-29129)
+    * Fixed that the wrong code style could be used (QTCREATORBUG-29145)
+
+Projects
+--------
+
+* Fixed a crash when triggering a build with unconfigured projects present
+  (QTCREATORBUG-29207)
+
+### CMake
+
+* Fixed that the global `Autorun CMake` option could be overridden by old
+  settings
+* Fixed the `Build CMake Target` locator filter in case a build is already
+  running (QTCREATORBUG-26699)
+* Presets
+    * Added the expansion of `${hostSystemName}` (QTCREATORBUG-28935)
+    * Fixed the Qt detection when `CMAKE_TOOLCHAIN_FILE` and `CMAKE_PREFIX_PATH`
+      are set
+
+Debugging
+---------
+
+* Fixed that debugger tooltips in the editor vanished after expanding
+  (QTCREATORBUG-29083)
+
+Test Integration
+----------------
+
+* GoogleTest
+    * Fixed the reporting of failed tests (QTCREATORBUG-29146)
+
+Credits for these changes go to:
+--------------------------------
+Alessandro Portale  
+André Pönitz  
+Artem Sokolovskii  
+Björn Schäpers  
+Christian Kandeler  
+Christian Stenger  
+Cristian Adam  
+David Schulz  
+Eike Ziller  
+Jaroslaw Kobus  
+Karim Abdelrahman  
+Leena Miettinen  
+Miikka Heikkinen  
+Patrik Teivonen  
+Robert Löhning  
+Sivert Krøvel  
diff --git a/dist/changelog/changes-11.0.0.md b/dist/changelog/changes-11.0.0.md
index 3286082636..a637950a44 100644
--- a/dist/changelog/changes-11.0.0.md
+++ b/dist/changelog/changes-11.0.0.md
@@ -10,21 +10,85 @@ the public Git repository. For example:
     git clone git://code.qt.io/qt-creator/qt-creator.git
     git log --cherry-pick --pretty=oneline origin/10.0..v11.0.0
 
+What's new?
+------------
+
+* Markdown editor with preview
+  ([QTCREATORBUG-27883](https://bugreports.qt.io/browse/QTCREATORBUG-27883))
+* Internal terminal
+  ([QTCREATORBUG-8511](https://bugreports.qt.io/browse/QTCREATORBUG-8511))
+* Experimental support for GitHub Copilot
+* Experimental support for the `vcpkg` C/C++ package manager
+* Experimental support for the Axivion static analyzer
+
+### Markdown
+
+You can open markdown (.md) files for editing or select `File > New File >
+General > Markdown File` to create a new file.
+
+([Documentation](https://doc-snapshots.qt.io/qtcreator-11.0/creator-markdown-editor.html))
+
+### Terminal
+
+When you select the `Run in Terminal` check box and run an application or the
+`Open Terminal` button to open a terminal, the default terminal opens in the
+`Terminal` output view. It supports multiple tabs, as well as various
+shells, colors, and fonts.
+
+To use an external terminal, deselect the `Use internal terminal` check box in
+`Preferences > Terminal`.
+
+([Documentation](https://doc-snapshots.qt.io/qtcreator-11.0/creator-output-panes.html#terminal))
+
+### Copilot
+
+The Copilot plugin (disabled by default) integrates
+[GitHub Copilot](https://github.com/features/copilot), which uses OpenAI to
+suggest code in the `Edit` mode.
+
+To set Copilot preferences, select `Preferences > Copilot`.
+
+([Documentation](https://doc-snapshots.qt.io/qtcreator-11.0/creator-copilot.html))
+
+### vcpkg
+
+The experimental vcpkg plugin integrates the [vcpgk](https://vcpkg.io)
+package manager for downloading and managing libraries.
+
+Select the `vcpkg` installation location in `Preferences > CMake > Vcpkg > Path`.
+
+To create a new `vcpkg.json` package manifest file, select `File > New File >
+vcpkg`. The file is automatically added to the CMakeLists.txt file for the
+project.
+
+Edit manifest files in the manifest editor. To search for packages to add to the
+file, select the `Search Package` button on the manifest editor toolbar.
+
+([Documentation](https://doc-snapshots.qt.io/qtcreator-11.0/creator-vcpkg.html))
+
+### Axivion
+
+After you configure access to the [Axivion](https://www.axivion.com) Dashboard
+and link a project to an Axivion project in the project settings, Qt Creator
+shows annotations of the latest run in the editors and allows you to view some
+details on the issues.
+
+([Documentation](https://doc-snapshots.qt.io/qtcreator-11.0/creator-axivion.html))
+
 General
 -------
 
-* Added a `Terminal` view (QTCREATORBUG-8511)
-  ([Documentation](https://doc-snapshots.qt.io/qtcreator-11.0/creator-output-panes.html#terminal))
-    * Opt-out via `Preferences` > `Terminal` preferences
-    * Added support for
-        * different shells, colors, fonts, and multiple tabs
-        * opening file paths in Qt Creator with `Ctrl+click` (`Cmd+click` on
-          macOS)
-* Added a more spacious "relaxed" toolbar style `Environment > Interface`
+* Added a more spacious `Relaxed` toolbar style to `Preferences > Environment >
+  Interface`
 * Added a pin button to progress details instead of automatically resetting
-  their position (QTCREATORBUG-28829)
+  their position
+  ([QTCREATORBUG-28829](https://bugreports.qt.io/browse/QTCREATORBUG-28829))
 * Improved the selection and navigation in the `Issues` view
-  (QTCREATORBUG-26128, QTCREATORBUG-27006, QTCREATORBUG-27506)
+  ([QTCREATORBUG-26128](https://bugreports.qt.io/browse/QTCREATORBUG-26128),
+   [QTCREATORBUG-27006](https://bugreports.qt.io/browse/QTCREATORBUG-27006),
+   [QTCREATORBUG-27506](https://bugreports.qt.io/browse/QTCREATORBUG-27506))
+* Fixed a crash with a large number of search hits from Silver Searcher
+  ([QTCREATORBUG-29130](https://bugreports.qt.io/browse/QTCREATORBUG-29130))
 * Locator
     * Improved performance
     * Added the creation of directories to the `Files in File System` filter
@@ -35,95 +99,137 @@ Editing
 -------
 
 * Improved the performance of the multi-cursor support
-* Fixed the saving of hardlinked files (QTCREATORBUG-19651)
-* Fixed an issue of copy and paste with multiple cursors (QTCREATORBUG-29117)
+* Fixed the saving of hardlinked files
+  ([QTCREATORBUG-19651](https://bugreports.qt.io/browse/QTCREATORBUG-19651))
+* Fixed an issue of copy and paste with multiple cursors
+  ([QTCREATORBUG-29117](https://bugreports.qt.io/browse/QTCREATORBUG-29117))
+* Fixed the handling of pre-edit text for input methods
+  ([QTCREATORBUG-29134](https://bugreports.qt.io/browse/QTCREATORBUG-29134))
 
 ### C++
 
-* Improved the style of forward declarations in the outline (QTCREATORBUG-312)
+* Improved the style of forward declarations in the outline
+  ([QTCREATORBUG-312](https://bugreports.qt.io/browse/QTCREATORBUG-312))
 * Added highlighting for typed string literals and user-defined literals
-  (QTCREATORBUG-28869)
-* Added the option to create class members from assignments (QTCREATORBUG-1918)
+  ([QTCREATORBUG-28869](https://bugreports.qt.io/browse/QTCREATORBUG-28869))
+* Extended the `Add Class Member` refactoring action to create class
+  members from assignments
+  ([QTCREATORBUG-1918](https://bugreports.qt.io/browse/QTCREATORBUG-1918))
+* Fixed that generated functions did not have a `const` qualifier when
+  required
+  ([QTCREATORBUG-29274](https://bugreports.qt.io/browse/QTCREATORBUG-29274))
 * Fixed that locator showed both the declaration and the definition of symbols
-  (QTCREATORBUG-13894)
+  ([QTCREATORBUG-13894](https://bugreports.qt.io/browse/QTCREATORBUG-13894))
 * Fixed the handling of C++20 keywords and concepts
+* Clangd
+    * Fixed that the index could be outdated after VCS operations
+    * Fixed the highlighting of labels
+      ([QTCREATORBUG-27338](https://bugreports.qt.io/browse/QTCREATORBUG-27338))
 * Built-in
-     * Fixed support for `if`-statements with initializer (QTCREATORBUG-29182)
+    * Fixed support for `if`-statements with initializer
+      ([QTCREATORBUG-29182](https://bugreports.qt.io/browse/QTCREATORBUG-29182))
+* Clang Format
+    * Fixed the conversion of tab indentation settings to Clang Format
+      ([QTCREATORBUG-29185](https://bugreports.qt.io/browse/QTCREATORBUG-29185))
 
 ### Language Server Protocol
 
-* Added experimental support for GitHub Copilot
-  ([GitHub documentation](https://github.com/features/copilot))
-  ([Qt Creator documentation](https://doc-snapshots.qt.io/qtcreator-11.0/creator-copilot.html))
-* Added missing actions for opening the `Call Hierarchy` (QTCREATORBUG-28839,
-  QTCREATORBUG-28842)
+* Added actions for opening the `Call Hierarchy` to the context menu of the
+  editor
+  ([QTCREATORBUG-28839](https://bugreports.qt.io/browse/QTCREATORBUG-28839),
+   [QTCREATORBUG-28842](https://bugreports.qt.io/browse/QTCREATORBUG-28842))
 
 ### QML
 
 * Fixed the reformatting in the presence of JavaScript directives and function
-  return type annotations (QTCREATORBUG-29001, QTCREATORBUG-29046)
-* Fixed that reformatting changed `of` to `in` (QTCREATORBUG-29123)
-* Fixed the completion for Qt Quick Controls (QTCREATORBUG-28648)
+  return type annotations
+  ([QTCREATORBUG-29001](https://bugreports.qt.io/browse/QTCREATORBUG-29001),
+   [QTCREATORBUG-29046](https://bugreports.qt.io/browse/QTCREATORBUG-29046))
+* Fixed that reformatting changed `of` to `in`
+  ([QTCREATORBUG-29123](https://bugreports.qt.io/browse/QTCREATORBUG-29123))
+* Fixed the completion for Qt Quick Controls
+  ([QTCREATORBUG-28648](https://bugreports.qt.io/browse/QTCREATORBUG-28648))
+* Fixed that `qmllint` issues were not shown in the `Issues` view
+  ([QTCREATORBUG-28720](https://bugreports.qt.io/browse/QTCREATORBUG-28720))
 
 ### Python
 
 * Added the option to create a virtual environment (`venv`) to the Python
-  interpreter selector and the wizard (PYSIDE-2152)
+  interpreter selector and the wizard
+  ([PYSIDE-2152](https://bugreports.qt.io/browse/PYSIDE-2152))
+* Fixed that too many progress indicators could be created
+  ([QTCREATORBUG-29224](https://bugreports.qt.io/browse/QTCREATORBUG-29224))
 
-### Markdown
-
-* Added a Markdown editor with preview (QTCREATORBUG-27883)
-* Added a wizard for Markdown files (QTCREATORBUG-29056)
+  ([Documentation](https://doc-snapshots.qt.io/qtcreator-11.0/creator-python-development.html))
 
 Projects
 --------
 
-* Made it possible to add devices without going through the wizard
-* Added support for moving files to a different directory when renaming
-  (QTCREATORBUG-15981)
+* Made it possible to add devices in `Preferences > Devices > Add` without going
+  through the wizard
+* Added support for moving files to a different directory when renaming them in
+  the `File System` view
+  ([QTCREATORBUG-15981](https://bugreports.qt.io/browse/QTCREATORBUG-15981))
+
+  ([Documentation](https://doc.qt.io/qtcreator/creator-file-system-view.html))
 
 ### CMake
 
-* Implemented adding files to the project (QTCREATORBUG-25922,
-  QTCREATORBUG-26006, QTCREATORBUG-27213, QTCREATORBUG-27538,
-  QTCREATORBUG-28493, QTCREATORBUG-28904, QTCREATORBUG-28985,
-  QTCREATORBUG-29006)
+* Implemented adding files to the project
+  ([QTCREATORBUG-25922](https://bugreports.qt.io/browse/QTCREATORBUG-25922),
+   [QTCREATORBUG-26006](https://bugreports.qt.io/browse/QTCREATORBUG-26006),
+   [QTCREATORBUG-27213](https://bugreports.qt.io/browse/QTCREATORBUG-27213),
+   [QTCREATORBUG-27538](https://bugreports.qt.io/browse/QTCREATORBUG-27538),
+   [QTCREATORBUG-28493](https://bugreports.qt.io/browse/QTCREATORBUG-28493),
+   [QTCREATORBUG-28904](https://bugreports.qt.io/browse/QTCREATORBUG-28904),
+   [QTCREATORBUG-28985](https://bugreports.qt.io/browse/QTCREATORBUG-28985),
+   [QTCREATORBUG-29006](https://bugreports.qt.io/browse/QTCREATORBUG-29006))
+* Added `Build > Reload CMake Presets` to reload CMake presets after making
+  changes to them
+* Added support for `block()` and `endblock()`
+* Fixed that CMake Presets were not visible in `Projects` view
+  ([QTCREATORBUG-28966](https://bugreports.qt.io/browse/QTCREATORBUG-28966))
 * Fixed issues with detecting a configured Qt version when importing a build
-  (QTCREATORBUG-29075)
+  ([QTCREATORBUG-29075](https://bugreports.qt.io/browse/QTCREATORBUG-29075))
 
 ### Python
 
-* Added an option for the interpreter to the wizards
-
-### vcpkg
-
-* Added experimental support for `vcpkg`
-  ([vcpgk documentation](https://vcpkg.io/en/))
-* Added an option for the `vcpkg` installation location
-* Added a search dialog for packages
-* Added a wizard and an editor for `vcpkg.json` files
+* Added an option for selecting the interpreter to the wizards in
+  `File > New Project > Application (Qt for Python)`
 
 Debugging
 ---------
 
-* Improved the UI for enabling and disabling debuggers (QTCREATORBUG-28627)
+* Improved the UI for enabling and disabling debuggers in `Projects > Run >
+  Debugger settings`
+  ([QTCREATORBUG-28627](https://bugreports.qt.io/browse/QTCREATORBUG-28627))
+* Fixed the automatic source mapping for Qt versions from an installer
+  ([QTCREATORBUG-28950](https://bugreports.qt.io/browse/QTCREATORBUG-28950))
+* Fixed pretty printer for `std::string` for recent `libc++`
+  ([QTCREATORBUG-29230](https://bugreports.qt.io/browse/QTCREATORBUG-29230))
 
 ### C++
 
 * Added an option for the default number of array elements to show
   (`Preferences > Debugger > Locals & Expressions > Default array size`)
+* Fixed debugging in a terminal as the root user
+  ([QTCREATORBUG-27519](https://bugreports.qt.io/browse/QTCREATORBUG-27519))
 * CDB
     * Added automatic source file mapping for Qt packages
-    * Fixed the variables view on remote Windows devices (QTCREATORBUG-29000)
+    * Fixed the variables view on remote Windows devices
+      ([QTCREATORBUG-29000](https://bugreports.qt.io/browse/QTCREATORBUG-29000))
 * LLDB
     * Fixed that long lines in the application output were broken into multiple
-      lines (QTCREATORBUG-29098)
+      lines
+      ([QTCREATORBUG-29098](https://bugreports.qt.io/browse/QTCREATORBUG-29098))
 
 ### Qt Quick
 
-* Improved the auto-detection if QML debugging is required (QTCREATORBUG-28627)
+* Improved the auto-detection if QML debugging is required
+  ([QTCREATORBUG-28627](https://bugreports.qt.io/browse/QTCREATORBUG-28627))
 * Added an option for disabling static analyzer messages to
-  `Qt Quick > QML/JS Editing` (QTCREATORBUG-29095)
+  `Qt Quick > QML/JS Editing`
+  ([QTCREATORBUG-29095](https://bugreports.qt.io/browse/QTCREATORBUG-29095))
 
 Analyzer
 --------
@@ -131,11 +237,8 @@ Analyzer
 ### Clang
 
 * Fixed that a `.clang-tidy` file in the project directory was not used by
-  default (QTCREATORBUG-28852)
-
-### Axivion
-
-* Added experimental support
+  default
+  ([QTCREATORBUG-28852](https://bugreports.qt.io/browse/QTCREATORBUG-28852))
 
 Version Control Systems
 -----------------------
@@ -143,7 +246,8 @@ Version Control Systems
 ### Git
 
 * Instant Blame
-    * Improved the performance (QTCREATORBUG-29151)
+    * Improved the performance
+      ([QTCREATORBUG-29151](https://bugreports.qt.io/browse/QTCREATORBUG-29151))
     * Fixed that it did not show at the end of the document
 
 Platforms
@@ -151,7 +255,8 @@ Platforms
 
 ### Android
 
-* Fixed an issue with building library targets (QTCREATORBUG-26980)
+* Fixed an issue with building library targets
+  ([QTCREATORBUG-26980](https://bugreports.qt.io/browse/QTCREATORBUG-26980))
 
 ### Remote Linux
 
@@ -159,14 +264,16 @@ Platforms
 
 ### Docker
 
-* Added support for `qmake` based projects (QTCREATORBUG-29140)
+* Added support for `qmake` based projects
+  ([QTCREATORBUG-29140](https://bugreports.qt.io/browse/QTCREATORBUG-29140))
 * Fixed issues after deleting the Docker image for a registered Docker device
-  (QTCREATORBUG-28880)
+  ([QTCREATORBUG-28880](https://bugreports.qt.io/browse/QTCREATORBUG-28880))
 
 ### QNX
 
 * Added `slog2info` as a requirement for devices
-* Fixed the support for remote working directories (QTCREATORBUG-28900)
+* Fixed the support for remote working directories
+  ([QTCREATORBUG-28900](https://bugreports.qt.io/browse/QTCREATORBUG-28900))
 
 Credits for these changes go to:
 --------------------------------