Merge remote-tracking branch 'origin/12.0'

Change-Id: I04104ef638b28d99da11b9b7a22f31f8d0ddf460

.github/workflows/build_cmake.yml

@@ -7,7 +7,7 @@ on:
       - 'doc/**'
 
 env:
-  QT_VERSION: 6.5.2
+  QT_VERSION: 6.6.0
   MACOS_DEPLOYMENT_TARGET: 10.15
   CLANG_VERSION: 17.0.1
   ELFUTILS_VERSION: 0.175
@@ -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")

coin/instructions/common_environment.yaml

@@ -10,7 +10,7 @@ instructions:
         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-12.0.0.md

@@ -66,9 +66,11 @@ General
   `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))
-* Added the `View > Show Menubar` option to hide the menu bar on platforms
+  ([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))
 * Fixed an issue with growing session files
 
 Help
@@ -77,13 +79,17 @@ 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))
 * 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))
@@ -93,11 +99,15 @@ Editing
 * 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))
-* Added a refactoring action for converting comments between C++-style and
+  ([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))
-* Added a refactoring action for moving documentation between function
+  ([Documentation](https://doc-snapshots.qt.io/qtcreator-12.0/creator-editor-quick-fixes.html#refactoring-c-code))
-  declaration and definition
+* 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),
@@ -130,13 +140,15 @@ Editing
 
 ### Language Server Protocol
 
-* Added support for Language servers that request creating, renaming or deleting of files
+* Added support for Language servers that request creating, renaming, or deleting
+  of files
   ([QTCREATORBUG-29542](https://bugreports.qt.io/browse/QTCREATORBUG-29542))
 
 ### 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))
 
 ### TODO
 
@@ -145,6 +157,7 @@ Editing
 ### Markdown
 
 * Added buttons and configurable shortcuts for text styles
+  ([Documentation](https://doc-snapshots.qt.io/qtcreator-12.0/creator-markdown-editor.html))
 
 ### Images
 
@@ -159,7 +172,9 @@ 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

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/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

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

@@ -59,7 +59,7 @@
     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.

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

@@ -75,8 +75,8 @@
 
     \section1 Changing Fonts and Colors
 
-    To change the default fonts and colors, select \uicontrol Edit >
+    To change the default fonts and colors, select \preferences >
-    \uicontrol Preferences > \uicontrol {Text Editor} > \uicontrol {Font & Colors}.
+    \uicontrol {Text Editor} > \uicontrol {Font & Colors}.
     Create your own color scheme and select new fonts and colors for the
     following results:
 

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

@@ -72,6 +72,6 @@
     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.
 */

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 >
+    To set preferences for the Valgrind tools, select \preferences >
-    \uicontrol Preferences > \uicontrol Analyzer. You can override the general
+    \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 >
+    To specify global settings for Valgrind, select \preferences >
-    \uicontrol Preferences > \uicontrol Analyzer. The \uicontrol
+    \uicontrol Analyzer. The \uicontrol {Memcheck Memory Analysis Options}
-    {Memcheck Memory Analysis Options} group has Memcheck 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
+    too big, select \preferences > \uicontrol Analyzer and define the length of
-    and define the length of the stack trace in the
+    the stack trace in the \uicontrol {Backtrace frame count} field.
-    \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 >
+    To specify global settings for Valgrind, select \preferences >
-    \uicontrol Preferences > \uicontrol Analyzer. The \uicontrol
+    \uicontrol Analyzer. The \uicontrol {Callgrind Profiling Options}
-    {Callgrind Profiling Options} group has Callgrind options.
+    group has Callgrind options.
 
     \image qtcreator-valgrind-callgrind-options.png "Valgrind options"
 

doc/qtcreator/src/android/androiddev.qdoc

@@ -55,10 +55,7 @@
     To set up the development environment for Android:
 
     \list 1
-        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Devices >
+        \li Select \preferences > \uicontrol Devices > \uicontrol Android.
-            \uicontrol Android on Windows and Linux or \uicontrol {\QC} >
-            \uicontrol Preferences > \uicontrol Devices > \uicontrol Android on
-            \macos.
             \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 >
+    To view the installed \l{Android NDK} versions, select \preferences >
-    \uicontrol Preferences > \uicontrol Devices > \uicontrol Android on Windows and
+    \uicontrol Devices > \uicontrol Android.
-    Linux or \uicontrol {\QC} > \uicontrol Preferences > \uicontrol Devices >
-    \uicontrol Android on \macos.
 
     \image qtcreator-options-android-sdk-tools.png {Android NDK and SDK checks}
 
@@ -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 >
+    To view the installed Android SDK packages, select \preferences >
-    \uicontrol Preferences > \uicontrol Devices > \uicontrol Android >
+    \uicontrol Devices > \uicontrol Android > \uicontrol {SDK Manager}.
-    \uicontrol {SDK Manager} on Windows and Linux or \uicontrol {\QC} >
-    \uicontrol Preferences > \uicontrol Devices > \uicontrol Android >
-    \uicontrol {SDK Manager} on \macos.
 
     \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
+    To view the available AVDs, select \preferences > \uicontrol Devices.
-    > \uicontrol Devices on Windows and Linux or \uicontrol {\QC} >
+    You can add more AVDs.
-    \uicontrol Preferences > \uicontrol Devices > on \macos. 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 >
+        \li Select \preferences > \uicontrol Devices >
-            \uicontrol Add > \uicontrol {Android Device} on Windows and Linux
+            \uicontrol Add > \uicontrol {Android Device} to open the
-            or \uicontrol {\QC} > \uicontrol Preferences > \uicontrol Devices >
-            \uicontrol Add > \uicontrol {Android Device} on \macos 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

@@ -70,7 +70,7 @@
     \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 +251,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,7 +265,7 @@
     \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
+    devices, select \preferences > \uicontrol Kits
     > \uicontrol Add. For more information, see \l{Add kits}.
 
     \image qtcreator-baremetal-kit.png "Kit preferences for Bare Metal"

doc/qtcreator/src/cmake/creator-projects-cmake-building.qdoc

@@ -137,9 +137,8 @@
 
     To view all variables, select the \uicontrol Advanced check box.
 
-    To view all variables by default, select \uicontrol Edit >
+    To view all variables by default, select \preferences > \uicontrol CMake >
-    \uicontrol Preferences > \uicontrol CMake > \uicontrol General >
+    \uicontrol General > \uicontrol {Show advanced options by default}.
-    \uicontrol {Show advanced options by default}.
 
     \image qtcreator-preferences-cmake-general.webp "General tab in CMake Preferences"
 
@@ -152,8 +151,8 @@
     stored in the CMakeLists.txt.user file, so deleting a build directory
     does not delete the initial configuration.
 
-    To be asked before \QC resets the changes, select \uicontrol Edit >
+    To be asked before \QC resets the changes, select \preferences >
-    \uicontrol Preferences > \uicontrol CMake > \uicontrol General >
+    \uicontrol CMake > \uicontrol General >
     \uicontrol {Ask before re-configuring with initial parameters}.
 
     \section1 Viewing CMake Output
@@ -230,7 +229,7 @@
     \QC can automatically set up the \l {Setting Up Conan}
     {Conan package manager} for use with CMake.
 
-    Select \uicontrol Edit > \uicontrol Preferences > \uicontrol CMake
+    Select \preferences > \uicontrol CMake
     \uicontrol General > \uicontrol {Package manager auto setup} to set the
     value of the \c CMAKE_PROJECT_INCLUDE_BEFORE variable to the path to a
     CMake script that installs dependencies from a \c conanfile.txt,

doc/qtcreator/src/cmake/creator-projects-cmake-presets.qdoc

@@ -141,7 +141,7 @@
     \endcode
 
     This example assumes that the CMake executable path is set in
-    \uicontrol Edit > \uicontrol Preferences > \uicontrol CMake >
+    \preferences > \uicontrol CMake >
     \uicontrol Tools.
 
     \section1 MSVC Example

doc/qtcreator/src/cmake/creator-projects-cmake.qdoc

@@ -39,9 +39,8 @@
     \QC automatically runs CMake to refresh project information when you edit
     a \c CMakeLists.txt configuration file in a project. Project information is
     also automatically refreshed when you build the project. To disable this
-    behavior, select \uicontrol Edit > \uicontrol Preferences > \uicontrol CMake
+    behavior, select \preferences > \uicontrol CMake > \uicontrol General, and
-    > \uicontrol General, and then deselect the \uicontrol {Autorun CMake}
+    then deselect the \uicontrol {Autorun CMake} check box.
-    check box.
 
     \image qtcreator-projects-view-edit.png {CMake project in Projects view}
 
@@ -54,8 +53,8 @@
 
     The \uicontrol Projects view shows the names of the subfolders where the
     source files are located. To hide the subfolder names and arrange the files
-    only according to their source group, select \uicontrol Edit >
+    only according to their source group, select \preferences >
-    \uicontrol Preferences > \uicontrol CMake > \uicontrol General, and then
+    \uicontrol CMake > \uicontrol General, and then
     deselect the \uicontrol {Show subfolders inside source group folders} check
     box. The change takes effect after you select \uicontrol Build >
     \uicontrol {Run CMake}.
@@ -89,8 +88,7 @@
 
     \list 1
 
-        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol CMake >
+        \li Select \preferences > \uicontrol CMake > \uicontrol Tools.
-            \uicontrol Tools.
 
             \image qtcreator-preferences-cmake-tools.webp {Tools tab in CMake Preferences}
 
@@ -118,8 +116,8 @@
     To remove the selected CMake executable from the list, select
     \uicontrol Remove.
 
-    To add the CMake tool to a build and run kit, select \uicontrol Edit >
+    To add the CMake tool to a build and run kit, select \preferences >
-    \uicontrol Preferences > \uicontrol Kits.
+    \uicontrol Kits.
     The kit also specifies the CMake generator that is used for producing
     project files for \QC and the initial configuration parameters:
 
@@ -169,8 +167,7 @@
     To automatically format CMake files upon file save:
 
     \list 1
-        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol CMake >
+        \li Select \preferences > \uicontrol CMake > \uicontrol Formatter.
-            \uicontrol Formatter.
             \image qtcreator-preferences-cmake-formatter.webp {Formatter tab in CMake Preferences}
         \li In \uicontrol {CMakeFormat command}, enter the path to
             \c {cmake-format.exe}.

doc/qtcreator/src/debugger/creator-debug-views.qdoc

@@ -218,9 +218,8 @@
     \if defined(qtcreator)
     \section1 Specifying Breakpoint Settings
 
-    You can specify settings for breakpoints in \uicontrol Edit >
+    You can specify settings for breakpoints in \preferences >
-    \uicontrol Preferences > \uicontrol Debugger. For more information,
+    \uicontrol Debugger. For more information, see \l{Debugger Preferences}.
-    see \l{Debugger Preferences}.
 
     \image qtcreator-debugger-general-options.png {General tab in Debugger preferences}
 

doc/qtcreator/src/debugger/creator-only/creator-debugger-settings.qdoc

@@ -8,9 +8,9 @@
 
     \title Debugger Preferences
 
-    To specify settings for managing debugger processes, select \uicontrol Edit
+    To specify settings for managing debugger processes, select \preferences >
-     > \uicontrol Preferences > \uicontrol Debugger. In the \uicontrol General tab,
+    \uicontrol Debugger. In the \uicontrol General tab,you can specify settings
-     you can specify settings that are common to all debuggers.
+    that are common to all debuggers.
 
     \image qtcreator-debugger-general-options.png "Debugger General preferences"
 
@@ -50,8 +50,8 @@
 
     \section1 Specifying GDB Settings
 
-    To specify settings for managing the GDB process, select \uicontrol Edit >
+    To specify settings for managing the GDB process, select \preferences >
-    \uicontrol Preferences > \uicontrol Debugger > \uicontrol GDB.
+    \uicontrol Debugger > \uicontrol GDB.
 
     \image qtcreator-gdb-options.png "GDB preferences"
 
@@ -136,8 +136,8 @@
 
     \section1 Specifying CDB Settings
 
-    To specify settings for managing the CDB process, select \uicontrol Edit >
+    To specify settings for managing the CDB process, select \preferences >
-    \uicontrol Preferences > \uicontrol Debugger > \uicontrol CDB.
+    \uicontrol Debugger > \uicontrol CDB.
 
     \image qtcreator-cdb-options.png "CDB preferences"
 
@@ -187,8 +187,7 @@
     to the symbol search path of the debugger:
 
     \list 1
-        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Debugger >
+        \li Select \preferences > \uicontrol Debugger > \uicontrol {CDB Paths}.
-            \uicontrol {CDB Paths}.
             \image qtcreator-debugger-cdb-paths.png
         \li In the \uicontrol {Symbol Paths} group, select \uicontrol Insert.
         \li Select the directory where you want to store the cached information.

doc/qtcreator/src/debugger/creator-only/creator-debugger-setup.qdoc

@@ -18,7 +18,7 @@
     The main debugger preferences are associated with the
     \l{Kits}{kit} you build and run your project with. To
     specify the debugger and compiler to use for each kit, select
-    \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits.
+    \preferences > \uicontrol Kits.
 
     \image qtcreator-kits.png {Kits preferences}
 
@@ -30,13 +30,13 @@
     installed replacement instead.
 
     To change the debugger in an automatically detected kit, select
-    \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits >
+    \preferences > \uicontrol Kits >
     \uicontrol Clone to create a copy of the kit, and change the
     parameters in the cloned kit. Make sure to enable the cloned kit
     for your project.
 
     If the debugger you want to use is not automatically detected, select
-    \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits >
+    \preferences > \uicontrol Kits >
     \uicontrol Debuggers > \uicontrol Add to add it.
 
     \image qtcreator-preferences-kits-debuggers.webp {Debuggers tab in Kits preferences}

doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc

@@ -133,19 +133,18 @@
 
     \QC checks whether the compiled application is up-to-date, and rebuilds and
     deploys it if you set the \uicontrol {Build before deploying} field to
-    build the whole project or the application to run and select he
+    build the whole project or the application to run and select the
-    \uicontrol {Always deploy before running} check box in
+    \uicontrol {Always deploy before running} check box in \preferences >
-    \uicontrol Edit > \uicontrol Preferences > \uicontrol {Build & Run} >
+    \uicontrol {Build & Run} > \uicontrol General. To debug the application
-    \uicontrol General. To debug the application without deploying
+    without deploying it, select \uicontrol Debug > \uicontrol {Start Debugging}
-    it, select \uicontrol Debug > \uicontrol {Start Debugging} >
+    > \uicontrol {Start Debugging Without Deployment}.
-    \uicontrol {Start Debugging Without Deployment}.
 
     The debugger then takes over and starts the application with suitable
     parameters.
 
     When using GDB or CDB as debug backend, you can specify additional commands
     to execute before and after the backend and debugged application are started or
-    attached in \uicontrol Edit > \uicontrol Preferences > \uicontrol Debugger >
+    attached in \preferences > \uicontrol Debugger >
     \uicontrol GDB and \uicontrol CDB. For more information, see
     \l{Debugger Preferences}.
 
@@ -210,7 +209,7 @@
 
     If a console application does not start up properly in the configured
     console and the subsequent attach fails, you can diagnose the issue by
-    using CDB's native console. Select \uicontrol Edit > \uicontrol Preferences >
+    using CDB's native console. Select \preferences >
     \uicontrol Debugger > \uicontrol CDB > \uicontrol {Use CDB console} to
     override the console set in the Windows system environment variables.
     Note that the native console does not prompt on application exit.
@@ -364,7 +363,7 @@
 
     The \QC installation program asks you whether you want to register \QC as a
     post-mortem debugger. To change the setting, select
-    \uicontrol Edit > \uicontrol Preferences > \uicontrol Debugger >
+    \preferences > \uicontrol Debugger >
     \uicontrol General > \uicontrol {Use \QC for post-mortem debugging}.
 
     You can launch the debugger in the post-mortem mode if an application
@@ -487,7 +486,7 @@
 
     By default, a non-responsive GDB process is terminated after 20 seconds.
     To increase the timeout in the \uicontrol {GDB timeout} field, select
-    \uicontrol Edit > \uicontrol Preferences > \uicontrol Debugger >
+    \preferences > \uicontrol Debugger >
     \uicontrol GDB. For more information about settings that you can specify
     to manage the GDB process, see \l{Specifying GDB Settings}.
 
@@ -560,9 +559,9 @@
 
     \endlist
 
-    To specify settings for managing the CDB process, select \uicontrol Edit >
+    To specify settings for managing the CDB process, select \preferences >
-    \uicontrol Preferences > \uicontrol Debugger > \uicontrol CDB. For more
+    \uicontrol Debugger > \uicontrol CDB. For more information, see
-    information, see \l{Specifying CDB Settings}.
+    \l{Specifying CDB Settings}.
 */
 
 
@@ -706,8 +705,7 @@
     \section1 Customizing Debug Views
 
     To change the appearance and behavior of the debug views, set preferences
-    in \uicontrol Edit > \uicontrol Preferences > \uicontrol Debugger >
+    in \preferences > \uicontrol Debugger > \uicontrol General.
-    \uicontrol General.
 
     \image qtcreator-debugger-general-options.png {General tab in Debugger preferences}
 
@@ -800,8 +798,8 @@
     select \uicontrol {Close Editor Tooltips} in the context menu in the
     \uicontrol Locals or \uicontrol Expressions view.
 
-    To disable tooltips for performance reasons, select \uicontrol Edit >
+    To disable tooltips for performance reasons, select \preferences >
-    \uicontrol Preferences > \uicontrol Debugger > \uicontrol General >
+    \uicontrol Debugger > \uicontrol General >
     \uicontrol {Use tooltips in main editor when debugging}.
 
     \section1 Examining Complex Values in Debug Views
@@ -848,9 +846,8 @@
     classes in a useful way.
 
     To change the number of array elements that are
-    requested when expanding entries, select \uicontrol Edit >
+    requested when expanding entries, select \preferences > \uicontrol {Debugger}
-    \uicontrol Preferences > \uicontrol {Debugger} >
+    > \uicontrol {Locals & Expressions} > \uicontrol {Default array size}.
-    \uicontrol {Locals & Expressions} > \uicontrol {Default array size}.
 
     \section1 Stepping Through Code
 
@@ -948,9 +945,8 @@
     value display format. The available options depend on the type of the
     current items, and are provided by the debugging helpers.
 
-    To force a plain C-like display of structures, select
+    To force a plain C-like display of structures, select \preferences >
-    \uicontrol Edit > \uicontrol Preferences > \uicontrol Debugger >
+    \uicontrol Debugger > \uicontrol {Locals & Expressions}, and then deselect the
-    \uicontrol {Locals & Expressions}, and then deselect the
     \uicontrol {Use Debugging Helpers} check box. This still uses the
     Python scripts, but generates more basic output. To force the plain display
     for a single object or for all objects of a given type, select
@@ -990,9 +986,8 @@
 
     If an instance of a class is derived from QObject, you can find all other
     objects connected to this object's slots with Qt's signals and slots
-    mechanism. Select \uicontrol Edit > \uicontrol Preferences
+    mechanism. Select \preferences > \uicontrol {Debugger} >
-    > \uicontrol {Debugger} > \uicontrol {Locals & Expressions} >
+    \uicontrol {Locals & Expressions} > \uicontrol {Use Debugging Helpers}.
-    \uicontrol {Use Debugging Helpers}.
 
     \image qtcreator-debugging-helper-options.webp {Locals & Expressions preferences}
 
@@ -1006,9 +1001,8 @@
     switch off the debugging helpers to make low-level structures visible.
 
     To switch off the debugging helpers, deselect
-    \uicontrol {Use Debugging Helpers} in \uicontrol Edit >
+    \uicontrol {Use Debugging Helpers} in \preferences >
-    \uicontrol Preferences > \uicontrol Debugger >
+    \uicontrol Debugger > \uicontrol {Locals & Expressions}.
-    \uicontrol {Locals & Expressions}.
 
     \omit
     \section2 Creating Snapshots
@@ -1112,8 +1106,8 @@
 
     When using CDB as debug backend, you can specify that the debugger should
     break when application modules are loaded or unloaded. To enable breaking
-    for the specified modules, select \uicontrol Edit > \uicontrol Preferences >
+    for the specified modules, select \preferences > \uicontrol Debugger >
-    \uicontrol Debugger > \uicontrol CDB.
+    \uicontrol CDB.
 
     \image qtcreator-cdb-options.png {CDB tab in Debugger preferences}
 
@@ -1150,8 +1144,7 @@
     To enable the debugger to step into the code and display the source code
     when using a copy of the source tree at a location different from the one
     at which the libraries were built, you can map source paths to target
-    paths in \uicontrol Edit > \uicontrol Preferences > \uicontrol Debugger >
+    paths in \preferences > \uicontrol Debugger > \uicontrol General:
-    \uicontrol General:
 
     \image qtcreator-debugger-general-options.png {General tab in Debugger preferences}
 
@@ -1264,8 +1257,8 @@
 
     \image qtcreator-debugger-log-view.webp {Debugger Log view}
 
-    If debug output is sent to the system log, select \uicontrol Edit >
+    If debug output is sent to the system log, select \preferences >
-    \uicontrol Preferences > \uicontrol Debugger > \uicontrol General >
+    \uicontrol Debugger > \uicontrol General >
     \uicontrol {Force logging to console} check box.
 
     Right-click the view to select the following actions:
@@ -1315,7 +1308,7 @@
     \image qtcreator-debugger-disassembler-view.webp {Disassembler view}
 
     By default, GDB shows AT&T style disassembly. To switch to the Intel style,
-    select \uicontrol Edit > \uicontrol Preferences > \uicontrol Debugger >
+    select \preferences > \uicontrol Debugger >
     \uicontrol GDB > \uicontrol {Use Intel style disassembly}.
 
     To open the \uicontrol Disassembler view:
@@ -1371,7 +1364,7 @@
     least one of the three supported backends is available.
 
     To use the default GDB pretty printers installed in your system or linked
-    to the libraries your application uses, select \uicontrol Preferences >
+    to the libraries your application uses, select \preferences >
     \uicontrol Debugger > \uicontrol GDB > \uicontrol {Load system GDB pretty
     printers}. For more information, see \l{Specifying GDB Settings}.
 
@@ -1381,9 +1374,9 @@
 
     You can have commands executed after built-in debugging helpers have
     been loaded and fully initialized. To load additional debugging helpers or
-    modify existing ones, select \uicontrol Edit > \uicontrol Preferences >
+    modify existing ones, select \preferences > \uicontrol Debugger >
-    \uicontrol Debugger > \uicontrol {Locals & Expressions}, and enter the
+    \uicontrol {Locals & Expressions}, and enter the commands in the
-    commands in the \uicontrol {Debugging Helper Customization} field.
+    \uicontrol {Debugging Helper Customization} field.
 
     \image qtcreator-debugging-helper-options.webp {Locals & Expressions preferences}
 
@@ -1403,9 +1396,8 @@
     \endcode
 
     To display a message box as soon as your application receives a signal
-    during debugging, select \uicontrol Edit > \uicontrol Preferences >
+    during debugging, select \preferences > \uicontrol Debugger > \uicontrol GDB >
-    \uicontrol Debugger > \uicontrol GDB > \uicontrol {Show a message box
+    \uicontrol {Show a message box when receiving a signal}.
-    when receiving a signal}.
 
     \section2 Adding Custom Debugging Helpers
 
@@ -1416,8 +1408,8 @@
     To add debugging helpers for custom types, add debugging helper
     implementations to the startup file of the native debuggers (for example,
     \c{~/.gdbinit} or \c{~/.lldbinit}) or specify them directly in the
-    \uicontrol {Additional Startup Commands} in \uicontrol Edit >
+    \uicontrol {Additional Startup Commands} in \preferences >
-    \uicontrol Preferences > \uicontrol Debugger > \uicontrol GDB.
+    \uicontrol Debugger > \uicontrol GDB.
 
     To get started with implementing debugging helpers for your own data types,
     you can put their implementation into the file
@@ -1450,9 +1442,8 @@
             update your \QC installation (when updating your Qt installation,
             for example), copy it to a safe location outside the \QC
             installation in your file system and specify the location in
-            \uicontrol Edit > \uicontrol Preferences > \uicontrol Debugger >
+            \preferences > \uicontrol Debugger > \uicontrol {Locals & Expressions}
-            \uicontrol {Locals & Expressions} >
+            > \uicontrol {Extra Debugging Helper}.
-            \uicontrol {Extra Debugging Helper}.
     \endlist
 
     The custom debugging helpers will be automatically picked up from
@@ -1593,7 +1584,7 @@
     common situations.
 
     When using CDB as debugger backend, you can enable the Python dumper by
-    selecting \uicontrol Edit > \uicontrol Preferences > \uicontrol Debugger >
+    selecting \preferences > \uicontrol Debugger >
     \uicontrol CDB > \uicontrol {Use Python dumper}.
 
     \image qtcreator-cdb-options.png {CDB preferences}
@@ -2042,9 +2033,8 @@
 
     When using GDB as backend, you can automatically save a copy of
     its symbol index in a cache on disk and retrieve it from there
-    when loading the same binary in the future. Select \uicontrol Edit
+    when loading the same binary in the future. Select \preferences >
-    > \uicontrol Preferences > \uicontrol Debugger > \uicontrol GDB >
+    \uicontrol Debugger > \uicontrol GDB > \uicontrol {Use automatic symbol cache}.
-    \uicontrol {Use automatic symbol cache}.
 
     \image qtcreator-gdb-options.png {GDB preferences}
 

doc/qtcreator/src/debugger/qtquick-debugging.qdoc

@@ -91,9 +91,8 @@
 
     \section2 Using Default Values
 
-    You can enable or disable QML debugging globally in \uicontrol Edit >
+    You can enable or disable QML debugging globally in \preferences >
-    \uicontrol Preferences > \uicontrol {Build & Run} >
+    \uicontrol {Build & Run} > \uicontrol {Default Build Properties}.
-    \uicontrol {Default Build Properties}.
 
     \image qtcreator-build-settings-default.png "Default Build Properties tab in Build & Run Preferences"
 
@@ -120,7 +119,7 @@
     \QC, it will be kept as you want it.
 
     There are some known issues in the interaction between the global setting
-    in \uicontrol Edit > \uicontrol Preferences > \uicontrol {Build & Run} >
+    in \preferences > \uicontrol {Build & Run} >
     \uicontrol {Default Build Properties} and the build configuration.
     For example, for qmake the global setting only affects build configurations
     that are automatically created when enabling a kit. Also, CMake ignores the

doc/qtcreator/src/docker/creator-docker.qdoc

@@ -33,7 +33,7 @@
     To add a Docker image as a device:
 
     \list 1
-        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Devices
+        \li Select \preferences > \uicontrol Devices
             > \uicontrol Docker and enter the path to the Docker CLI in
             the \uicontrol Command field.
             \image qtcreator-preferences-devices-docker.webp "Docker tab in Devices preferences"
@@ -145,7 +145,7 @@
 
     \section1 Editing Docker Device Kits
 
-    Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits to check
+    Select \preferences > \uicontrol Kits to check
     that the automatically generated kits point to the appropriate kit items.
 
     To specify build settings:

doc/qtcreator/src/editors/creator-code-completion.qdoc

@@ -28,8 +28,8 @@
 
     \section1 Specifying Completion Settings
 
-    To specify settings for code completion, select \uicontrol Edit >
+    To specify settings for code completion, select \preferences >
-    \uicontrol Preferences > \uicontrol {Text Editor} > \uicontrol Completion.
+    \uicontrol {Text Editor} > \uicontrol Completion.
 
     \image qtcreator-preferences-texteditor-completion.webp "Text Editor Completion preferences"
 
@@ -153,7 +153,7 @@
 
     Code snippets specify code constructs. You can add, modify,
     and remove snippets in the snippet editor. To open the editor, select
-    \uicontrol Edit > \uicontrol Preferences > \uicontrol {Text Editor} >
+    \preferences > \uicontrol {Text Editor} >
     \uicontrol Snippets.
 
     \if defined(qtcreator)
@@ -296,7 +296,7 @@
     completion.
 
     To use Nimsuggest, you must install it on the development PC. Then select
-    \uicontrol Edit > \uicontrol Preferences > \uicontrol Nim > \uicontrol Tools,
+    \preferences > \uicontrol Nim > \uicontrol Tools,
     and enter the path to the tool executable in the \uicontrol Path field.
 
     \sa {Document code}

doc/qtcreator/src/editors/creator-code-indentation.qdoc

@@ -43,9 +43,9 @@
     \section1 Automatically fix indentation
 
     To automatically fix indentation according to the indentation settings
-    when you save the file, select \uicontrol Edit > \uicontrol Preferences >
+    when you save the file, select \preferences > \uicontrol {Text Editor} >
-    \uicontrol {Text Editor} > \uicontrol Behavior >
+    \uicontrol Behavior > \uicontrol {Clean whitespace} >
-    \uicontrol {Clean whitespace} > \uicontrol {Clean indentation}. Select
+    \uicontrol {Clean indentation}. Select
     the \uicontrol {Skip clean whitespace for file types} check box to
     exclude the specified file types.
 
@@ -53,8 +53,8 @@
 
     \section1 Show whitespace in editor
 
-    To visualize whitespace in the editor, select \uicontrol Edit >
+    To visualize whitespace in the editor, select \preferences >
-    \uicontrol Preferences > \uicontrol {Text Editor} > \uicontrol Display >
+    \uicontrol {Text Editor} > \uicontrol Display >
     \uicontrol {Visualize whitespace}.
 
     To visualize indentation, select \uicontrol {Visualize Indent}. To adjust the

doc/qtcreator/src/editors/creator-code-refactoring.qdoc

@@ -22,7 +22,7 @@
     \l{Applying Refactoring Actions}.
 
     By default, the refactored files are saved automatically. To disable
-    this feature, deselect \uicontrol Edit > \uicontrol Preferences >
+    this feature, deselect \preferences > \uicontrol Environment >
     \uicontrol System > \uicontrol {Auto-save files after refactoring}.
 
     \if defined(qtcreator)

doc/qtcreator/src/editors/creator-code-syntax.qdoc

@@ -39,7 +39,7 @@
     of the line annotations.
 
     To modify the colors used for underlining errors and warnings, select
-    \uicontrol Edit > \uicontrol Preferences > \uicontrol {Text Editor} >
+    \preferences > \uicontrol {Text Editor} >
     \uicontrol {Font & Colors} > \uicontrol Copy, and select new colors for
     \uicontrol Error and \uicontrol Warning.
 
@@ -55,7 +55,7 @@
     \section1 Specifying Line Annotation Positions
 
     To specify the position where the annotations are displayed, select
-    \uicontrol Edit > \uicontrol Preferences > \uicontrol {Text Editor} >
+    \preferences > \uicontrol {Text Editor} >
     \uicontrol Display > \uicontrol {Line annotations}, and then select
     whether to display the annotations directly next to the code, aligned
     to the right of the code, or in the right margin. Showing annotations
@@ -701,9 +701,9 @@
 
     \section1 Enabling and Disabling Messages
 
-    To enable and disable QML and JavaScript messages, select \uicontrol Edit >
+    To enable and disable QML and JavaScript messages, select \preferences >
-    \uicontrol Preferences > \uicontrol {Qt Quick} > \uicontrol {QML/JS Editing}
+    \uicontrol {Qt Quick} > \uicontrol {QML/JS Editing} >
-    > \uicontrol {Use customized static analyzer}.
+    \uicontrol {Use customized static analyzer}.
 
     \image qtcreator-preferences-qtquick-qmljs-editing.webp {QML/JS Editing tab in Qt Quick preferences}
 
@@ -739,8 +739,8 @@
 
     \section1 Automatically Formatting QML/JS Files
 
-    To automatically format QML/JS files upon saving, select \uicontrol Edit >
+    To automatically format QML/JS files upon saving, select \preferences >
-    \uicontrol Preferences > \uicontrol {Qt Quick} > \uicontrol {QML/JS Editing} >
+    \uicontrol {Qt Quick} > \uicontrol {QML/JS Editing} >
     \uicontrol {Enable auto format on file save}.
     To only format files that belong to the current project, select
     \uicontrol {Restrict to files contained in the current project}.
@@ -763,9 +763,8 @@
     This action expands all C++ macros to their actual code and removes code that
     is guarded by a currently inactive \c {#ifdef} statements. If you deselect
     the \uicontrol {Use built-in preprocessor to show pre-processed files} check
-    box in \uicontrol Edit > \uicontrol Preferences > \uicontrol C++ >
+    box in \preferences > \uicontrol C++ > \uicontrol {Code Model}, this action
-    \uicontrol {Code Model}, this action also expands all
+    also expands all \c {"#include <foo.h>"} statements to their actual contents.
-    \c {"#include <foo.h>"} statements to their actual contents.
 
     \image qtcreator-preferences-code-model.webp {C++ Code Model preferences}
 

doc/qtcreator/src/editors/creator-diff-editor.qdoc

@@ -100,7 +100,7 @@
 
     \section1 Changing the Colors
 
-    To change the default colors, select \uicontrol Edit > \uicontrol Preferences >
+    To change the default colors, select \preferences >
     \uicontrol {Text Editor} > \uicontrol {Font & Colors}. Create your own color
     scheme and select new colors for the following items:
 

doc/qtcreator/src/editors/creator-editors-options-text.qdoc

@@ -23,9 +23,8 @@
     \endif
 
     Set the font preferences and apply color schemes for syntax highlighting,
-    diff editor, and code analysis results in \uicontrol Edit >
+    diff editor, and code analysis results in \preferences >
-    \uicontrol Preferences > \uicontrol {Text Editor} >
+    \uicontrol {Text Editor} > \uicontrol {Font & Colors}.
-    \uicontrol {Font & Colors}.
 
     \image qtcreator-font-colors.png "Text editor preferences"
 
@@ -35,9 +34,8 @@
     percentage for viewing the text. You can also zoom in or out by pressing
     \key {Ctrl++} or \key {Ctrl+-}, or by pressing \key Ctrl and rolling
     the mouse button up or down. To disable the mouse wheel function, select
-    \uicontrol Edit > \uicontrol Preferences > \uicontrol {Text Editor} >
+    \preferences > \uicontrol {Text Editor} > \uicontrol Behavior and deselect
-    \uicontrol Behavior and deselect the
+    the \uicontrol {Enable scroll wheel zooming} check box.
-    \uicontrol {Enable scroll wheel zooming} check box.
 
     To improve the readability of text in the editor, adjust the line spacing in
     the \uicontrol {Line spacing} field.
@@ -55,9 +53,8 @@
 
     \list 1
 
-        \li Select \uicontrol Edit > \uicontrol Preferences >
+        \li Select \preferences > \uicontrol {Text Editor} >
-            \uicontrol {Text Editor} > \uicontrol {Fonts & Color} >
+            \uicontrol {Fonts & Color} > \uicontrol Copy.
-            \uicontrol Copy.
 
         \li Enter a name for the color scheme and click \uicontrol OK.
 
@@ -86,7 +83,7 @@
     \section2 Exporting and Importing Color Schemes
 
     To share color schemes with others, export and import them as XML files.
-    To export a color scheme, select \uicontrol Edit > \uicontrol Preferences >
+    To export a color scheme, select \preferences >
     \uicontrol {Text Editor} > \uicontrol {Fonts & Color} > \uicontrol Export,
     and then select the filename and location for the XML file.
 
@@ -101,8 +98,8 @@
 
     \section2 File Encoding
 
-    To define the default file encoding, select \uicontrol Edit >
+    To define the default file encoding, select \preferences >
-    \uicontrol Preferences > \uicontrol {Text Editor} > \uicontrol Behavior, and
+    \uicontrol {Text Editor} > \uicontrol Behavior, and
     then select a suitable option in \uicontrol {Default encoding}.
 
     \image qtcreator-options-texteditor-behavior-file-encodings.png "File encoding preferences"

doc/qtcreator/src/editors/creator-editors-options.qdoc

@@ -19,7 +19,7 @@
     \title Configuring the Editor
 
     You can configure the text editor to suit your specific needs by selecting
-    \uicontrol Edit > \uicontrol Preferences > \uicontrol{Text Editor}.
+    \preferences > \uicontrol{Text Editor}.
 
     \image qtcreator-font-colors.png "Text Editor preferences"
 
@@ -57,9 +57,8 @@
         \li Set \l{Indent text or code}{tabs, indentation, the handling of
             whitespace, and mouse operations} in \uicontrol Behavior.
 
-        \li Set various display properties, such as
+        \li Set various display properties, such as \l{Highlighting Blocks}
-            \l{Highlighting and folding blocks}
+            {highlighting} or \l{Folding Blocks}{folding} blocks or text
-            {highlighting and folding blocks} or text
             wrapping in \uicontrol Display.
 
         \li Add, modify, and remove \l{Editing Code Snippets}{code snippets} in

doc/qtcreator/src/editors/creator-locator.qdoc

@@ -231,8 +231,7 @@
 
     \list 1
 
-        \li Select \uicontrol Edit > \uicontrol Preferences >
+        \li Select \preferences > \uicontrol Environment > \uicontrol Locator >
-            \uicontrol Environment > \uicontrol Locator >
             \uicontrol {Web Search} > \uicontrol Edit.
 
         \li Select \uicontrol Add to add a new entry to the list.
@@ -307,8 +306,7 @@
 
     \list 1
 
-        \li Select \uicontrol Edit > \uicontrol Preferences >
+        \li Select \preferences > \uicontrol Environment > \uicontrol Locator.
-            \uicontrol Environment > \uicontrol Locator.
 
         \li In \uicontrol {Refresh interval}, define new time in minutes.
 

doc/qtcreator/src/editors/creator-only/creator-beautifier.qdoc

@@ -52,14 +52,14 @@
             \uicontrol Beautifier to enable the plugin.
 
             \note Since \QC 10.0.0, the ClangFormat plugin is enabled by
-            default. Select \uicontrol Edit > \uicontrol Preferences >
+            default. Select \preferences >
             \uicontrol {C++} > \uicontrol {Formatting mode} > \uicontrol Disable
             to turn off ClangFormat if you enable Beautifier because combining
             them can lead to unexpected results.
 
         \li Select \uicontrol {Restart Now} to restart \QC and load the plugin.
 
-        \li Select \uicontrol Edit > \uicontrol Preferences >
+        \li Select \preferences >
             \uicontrol Beautifier to specify settings for beautifying files.
 
         \li Select the \uicontrol {Enable auto format on file save} check box to
@@ -148,7 +148,7 @@
 
             \endlist
 
-        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Beautifier
+        \li Select \preferences > \uicontrol Beautifier
             > \uicontrol {Artistic Style}, \uicontrol ClangFormat, or
             \uicontrol Uncrustify > \uicontrol {Format Current File} to format
             the currently open file.

doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc

@@ -82,7 +82,7 @@
 
     \endlist
 
-    To use the built-in code model instead, select \uicontrol Edit > \uicontrol Preferences >
+    To use the built-in code model instead, select \preferences >
     \uicontrol C++ > \uicontrol clangd, and deselect the \uicontrol {Use clangd} check box.
     This setting also exists on the project level, so that you can have the clang-based
     services generally enabled, but switch them off for certain projects, or vice versa.
@@ -100,7 +100,7 @@
 
     \list 1
 
-        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol C++ >
+        \li Select \preferences > \uicontrol C++ >
             \uicontrol {Code Model}.
 
             \image qtcreator-preferences-code-model.webp {C++ Code Model preferences}
@@ -159,9 +159,9 @@
     To specify settings for clangd:
 
     \list 1
-        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol C++ >
+        \li Select \preferences > \uicontrol C++ >
             \uicontrol Clangd > \uicontrol {Use clangd}.
-            \image qtcreator-options-clangd.png "clangd preferences"
+            \image qtcreator-preferences-clangd.webp "Clangd preferences"
         \li In \uicontrol {Path to executable}, enter the path to clangd
             version 14, or later.
         \li In the \uicontrol {Background indexing} field, select \uicontrol Off
@@ -169,15 +169,25 @@
             by default. You can set the indexing priority depending on whether
             the accuracy of results or speed is more important to you during
             global symbol searches.
+        \li In \uicontrol {Header/source switch mode}, select the C/C++
+            backend for switching between header and source files. While the
+            clangd implementation has more capabilities than the built-in
+            code model, it tends to find false positives. \uicontrol {Try Both}
+            uses clangd if the built-in code model does not find anything.
         \li By default, clangd attempts to use all unused cores. You can set a
             fixed number of cores to use in \uicontrol {Worker thread count}.
             Background indexing also uses this many worker threads.
-        \li Select \uicontrol {Insert header files on completion} to allow
-            clangd to insert header files as part of symbol completion.
         \li Set the number of \uicontrol {Completion results} if you regularly
             miss important results during code completion. Set it to 0 to remove
             the limit on the number of completion results. Setting this to 0 or a
             very high number can make code completion slow.
+        \li In \uicontrol {Completion ranking model}, select the clangd model to
+            use for ranking completion suggestions. This determines their order
+            in the selection list. The \uicontrol {Decision Forest} model
+            (\uicontrol Default) results from pre-trained machine learning
+            and usually provides better results than the hand-crafted
+            \uicontrol Heuristic model. Select the latter if the completion
+            suggestions stray too much from your expectations for your code base.
         \li In \uicontrol {Document update threshold}, specify the amount of
             time \QC waits before sending document changes to the server.
             If the document changes again while waiting, this timeout is reset.

doc/qtcreator/src/editors/creator-only/creator-code-pasting.qdoc

@@ -23,8 +23,7 @@
     To specify settings for the code pasting service:
 
     \list 1
-        \li Select \uicontrol Edit > \uicontrol Preferences  >
+        \li Select \preferences > \uicontrol {Code Pasting}.
-            \uicontrol {Code Pasting}.
             \image qtcreator-code-pasting-options.png "Code Pasting preferences"
         \li In the \uicontrol {Default protocol} field, select a code pasting
             service to use by default.

doc/qtcreator/src/editors/creator-only/creator-coding-edit-mode.qdoc

@@ -17,8 +17,8 @@
 
     \image qtcreator-editortoolbar-symbols.webp {Edit mode toolbar}
 
-    To add more space around the toolbar items, select \uicontrol Edit >
+    To add more space around the toolbar items, select \preferences >
-    \uicontrol Preferences > \uicontrol Environment > \uicontrol Interface, and
+    \uicontrol Environment > \uicontrol Interface, and
     then select \uicontrol Relaxed in the \uicontrol {Toolbar style} field.
 
     \image qtcreator-preferences-environment-interface.webp {Interface tab in Environment preferences}
@@ -81,7 +81,7 @@
     \section2 Changing Text Encoding
 
     To show the file encoding of the current file on the editor toolbar (5),
-    select \uicontrol Edit > \uicontrol Preferences > \uicontrol {Text Editor} >
+    select \preferences > \uicontrol {Text Editor} >
     \uicontrol Display > \uicontrol {Display file encoding}.
 
     To change the text encoding, click it on the toolbar and select new
@@ -97,11 +97,11 @@
 
     To switch between Windows line endings (CRLF) and Unix line endings (LF),
     select the ending style on the editor toolbar (6). To hide this field,
-    select \uicontrol Edit > \uicontrol Preferences > \uicontrol {Text Editor}
+    select \preferences > \uicontrol {Text Editor}
     > \uicontrol Display, and deselect \uicontrol {Display file line ending}.
 
     To set the line endings to use for all projects by default, select
-    \uicontrol Edit > \uicontrol Preferences > \uicontrol {Text Editor} >
+    \preferences > \uicontrol {Text Editor} >
     \uicontrol Behavior, and then select the ending style in the
     \uicontrol {Default line endings} field.
 
@@ -269,9 +269,8 @@
     splits opened, you can open the link in the next split by holding \key Ctrl
     and \key Alt while clicking the symbol.
 
-    To enable this moving function, select \uicontrol Edit >
+    To enable this moving function, select \preferences > \uicontrol {Text Editor}
-    \uicontrol Preferences > \uicontrol {Text Editor} > \uicontrol Behavior >
+    > \uicontrol Behavior > \uicontrol {Enable mouse navigation}.
-    \uicontrol {Enable mouse navigation}.
 
     There are several additional ways of moving between symbol definitions and
     declarations. All the functions described below are also available from the
@@ -307,8 +306,8 @@
     split, prepend \key {Ctrl+E} to the shortcut. For example, press
     \key {Ctrl+E,F2} to follow the symbol in the next split. If necessary, the
     view is automatically split. To change the default behavior, select
-    \uicontrol Edit > \uicontrol Preferences > \uicontrol {Text Editor} >
+    \preferences > \uicontrol {Text Editor} > \uicontrol Display >
-    \uicontrol Display > \uicontrol {Always open links in another split}.
+    \uicontrol {Always open links in another split}.
     Additional symbols are
     displayed and switching between definition and declaration is done in
     another split. If you change the default behavior, the shortcuts for opening

doc/qtcreator/src/editors/creator-only/creator-copilot.qdoc

@@ -26,9 +26,9 @@
     \list
         \li An active \l{https://docs.github.com/en/billing/managing-billing-for-github-copilot/about-billing-for-github-copilot}
             {GitHub Copilot subscription}.
-        \li GitHub Copilot Neovim plugin installed, as described in
+        \li GitHub Copilot Neovim plugin installed (requires Node.js), as described in
-            \l{https://docs.github.com/en/copilot/getting-started-with-github-copilot?tool=neovim}
+            \l{https://github.com/github/copilot.vim/blob/release/README.md}
-            {About GitHub Copilot and Neovim}.
+            {Copilot.vim/Readme.md}.
     \endlist
 
     \section1 Enabling the Copilot Plugin
@@ -36,8 +36,9 @@
     To enable the Copilot plugin:
 
     \list 1
-        \li Select \uicontrol Help > \uicontrol {About Plugins} >
+        \li Select \uicontrol Help (or \uicontrol {\QC} on \macos) >
-            \uicontrol Utilities > \uicontrol Copilot to enable the plugin.
+            \uicontrol {About Plugins} > \uicontrol Utilities >
+            \uicontrol Copilot to enable the plugin.
         \li Select \uicontrol {Restart Now} to restart \QC and load the plugin.
     \endlist
 
@@ -46,8 +47,7 @@
     To set preferences for using Copilot:
 
     \list 1
-        \li Select \uicontrol Edit > \uicontrol Preferences >
+        \li Select \preferences > \uicontrol Copilot.
-            \uicontrol Copilot.
             \image qtcreator-preferences-copilot.webp {Copilot tab in Preferences}
         \li Select the \uicontrol {Enable Copilot} check box to use Copilot.
         \li Select \uicontrol {Sign In} to sign into your subscription, activate
@@ -57,17 +57,33 @@
         \li In the \uicontrol {Node.js path} field, enter the full path to the
             Node.js executable.
         \li In the \uicontrol {Path to agent.js} field, enter the path to
-            agent.js in the Copilot Neovim plugin.
+            agent.js in the Copilot Neovim plugin installation folder.
-        \li Select the \uicontrol {Request completions automatically} checkbox to
+        \li Select the \uicontrol {Auto request} check box to receive suggestions
-            receive suggestions for the current text cursor position when you
+            for the current text cursor position when you make changes.
-            make changes.
+        \li Select the \uicontrol {Use proxy} check box to use a proxy server to
+            connect to Copilot servers.
+        \li In the \uicontrol {Proxy host} field, enter the host name of the
+            proxy server.
+        \li In the \uicontrol {Proxy port} field, enter the port number of the
+            proxy server.
+        \li Select the \uicontrol {Reject unauthorized} check box to prevent the
+            security risk presented by accepting unauthorized certificates from
+            the proxy server.
+        \li In the \uicontrol {Proxy user} field, enter the user name to
+            authenticate to the proxy server.
+        \li Select the \uicontrol {Save proxy password} check box to save the
+            password to authenticate to the proxy server.
+            \note The password is saved insecurely.
+        \li In the \uicontrol {Proxy password} field, enter the password to save.
+            To see the password as you type, select the \inlineimage icons/original-size.png
+            button.
     \endlist
 
     \section1 Receiving Suggestions
 
     When you write code in the \l {Working in Edit Mode}{Edit} mode and
-    \uicontrol {Request completions automatically} is enabled, Copilot
+    \uicontrol {Auto request} is enabled, Copilot automatically makes
-    automatically makes suggestions when you type.
+    suggestions when you type.
 
     \image qtcreator-copilot.gif {Receiving suggestions from Copilot in the editor}
 
@@ -95,8 +111,7 @@
     To enable or disable Copilot suggestions globally, select the
     \inlineimage icons/copilot.png
     (\uicontrol {Toggle Copilot}) button. This also sets the value of the
-    \uicontrol {Enable Copilot} check box in \uicontrol Edit >
+    \uicontrol {Enable Copilot} check box in \preferences accordingly.
-    \uicontrol Preferences accordingly.
 
     To enable or disable Copilot suggestions for a particular project,
     select \uicontrol Projects > \uicontrol {Project Settings} >

doc/qtcreator/src/editors/creator-only/creator-fakevim.qdoc

@@ -93,7 +93,7 @@
     \section2 Plugin Emulation
 
     FakeVim also emulates some popular vim plugins. To enable plugin emulation
-    for particular plugins, select \uicontrol Edit > \uicontrol Preferences >
+    for particular plugins, select \preferences >
     \uicontrol FakeVim > \uicontrol General > \uicontrol {Plugin Emulation}.
 
     \image qtcreator-fakevim-options-general-plugin-emulation.png "FakeVim Plugin Emulation preferences"
@@ -269,8 +269,8 @@
     \section1 Mapping FakeVim Commands
 
     To map commands entered on the \uicontrol FakeVim command line to
-    \QC functions, select \uicontrol Edit > \uicontrol Preferences >
+    \QC functions, select \preferences > \uicontrol FakeVim >
-    \uicontrol FakeVim > \uicontrol {Ex Command Mapping}.
+    \uicontrol {Ex Command Mapping}.
     Enter a string in the \uicontrol Filter field to search for a specific
     \QC function.
 
@@ -284,17 +284,17 @@
     To reset the trigger expressions for all functions, select
     \uicontrol {Reset All}.
 
-    To map \e {user commands} to keyboard shortcuts, select \uicontrol Edit >
+    To map \e {user commands} to keyboard shortcuts, select \preferences >
-    \uicontrol Preferences > \uicontrol FakeVim >
+    \uicontrol FakeVim > \uicontrol {User Command Mapping}. The user command
-    \uicontrol {User Command Mapping}. The user command mapped to the shortcut
+    mapped to the shortcut is executed by FakeVim as if you were typing it
-    is executed by FakeVim as if you were typing it (as when replaying a macro).
+    (as when replaying a macro).
 
     \image qtcreator-fakevim-options-user-command-mapping.png "FakeVim User Command Mapping preferences"
 
     \section1 Setting FakeVim Preferences
 
-    To make changes to the Vim-style settings, select \uicontrol Edit >
+    To make changes to the Vim-style settings, select \preferences >
-    \uicontrol Preferences > \uicontrol FakeVim > \uicontrol General.
+    \uicontrol FakeVim > \uicontrol General.
 
     \image qtcreator-fakevim-options.png "FakeVim preferences"
 
@@ -304,13 +304,13 @@
     select \uicontrol {Set Plain Style}. You can then change any of the
     preselected settings.
 
-    To use a Vim-style color scheme, select \uicontrol Edit >
+    To use a Vim-style color scheme, select \preferences >
-    \uicontrol Preferences > \uicontrol {Text Editor} > \uicontrol {Fonts & Color}.
+    \uicontrol {Text Editor} > \uicontrol {Fonts & Color}.
     In the \uicontrol {Color Scheme} list, select \uicontrol {Vim (dark)}.
 
     \section1 Quitting FakeVim Mode
 
-    To quit the FakeVim mode, deselect \uicontrol Edit > \uicontrol Preferences >
+    To quit the FakeVim mode, deselect \preferences >
     \uicontrol FakeVim > \uicontrol {Use FakeVim} or press \key {Alt+V,Alt+V}.
 
     You can temporarily escape FakeVim mode to access the normal \QC keyboard

doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc

@@ -18,8 +18,7 @@
         \li \l{Completing Code}{Code completion}
         \li Sending document formatting requests to the language server to
             automatically format documents using the settings specified in
-            \uicontrol Edit > \uicontrol Preferences > \uicontrol {Text Editor}
+            \preferences > \uicontrol {Text Editor} > \uicontrol Behavior
-            > \uicontrol Behavior
         \li Highlighting the symbol under cursor
         \li \l{View function tooltips}
         \li \l{Semantic Highlighting}{Semantic highlighting}, as defined in
@@ -62,10 +61,8 @@
     server is added by default and you can edit its preferences.
     For other languages, you can add generic stdIO language servers.
 
-    To add language servers, select \uicontrol Edit > \uicontrol Preferences >
+    To add language servers, select \preferences >
-    \uicontrol {Language Client} > \uicontrol Add (or \uicontrol {Qt Creator} >
+    \uicontrol {Language Client} > \uicontrol Add.
-    \uicontrol Preferences > \uicontrol {Language Client} > \uicontrol Add
-    on \macos).
 
     To enable a language server, select the check box next to the language
     server name and set server preferences.
@@ -77,9 +74,8 @@
     To add a generic language server:
 
     \list 1
-        \li Select \uicontrol Edit > \uicontrol Preferences >
+        \li Select \preferences > \uicontrol {Language Client} >
-            \uicontrol {Language Client} > \uicontrol Add >
+            \uicontrol Add > \uicontrol {Generic StdIO Language Server}
-            \uicontrol {Generic StdIO Language Server}
             to add a generic language server.
             \image qtcreator-language-server-generic-stdio.png
         \li In the \uicontrol Name field, enter a name for the language server.
@@ -110,9 +106,9 @@
     To add a Java language server:
 
     \list 1
-        \li Select \uicontrol Edit > \uicontrol Preferences >
+        \li Select \preferences > \uicontrol {Language Client} >
-            \uicontrol {Language Client} > \uicontrol Add >
+            \uicontrol Add > \uicontrol {Java Language Server} to add
-            \uicontrol {Java Language Server} to add a Java language server.
+            a Java language server.
             \image qtcreator-language-client-options-java.png "Java language server preferences"
         \li In the \uicontrol Name field, enter a name for the language server.
             Select the \inlineimage icons/replace.png
@@ -130,8 +126,8 @@
     To set preferences for Python language servers:
 
     \list 1
-        \li Select \uicontrol Edit > \uicontrol Preferences >
+        \li Select \preferences> \uicontrol Python >
-            \uicontrol Python > \uicontrol {Language Server Configuration} to
+            \uicontrol {Language Server Configuration} to
             select the Python language server plugins to use.
             \image qtcreator-python-plugins.png "Python Language Server Configuration"
         \li Select \uicontrol Advanced to configure the plugins.
@@ -149,7 +145,7 @@
 
     Since Qt 6.4, the \c qmlls language server offers code completion and
     issues warnings for QML. To enable QML language server support, select
-    \uicontrol Edit > \uicontrol Preferences > \uicontrol {Qt Quick} >
+    \preferences > \uicontrol {Qt Quick} >
     \uicontrol {QML/JS Editing} > \uicontrol {Use qmlls (EXPERIMENTAL!)}.
     To use the latest version of the language server installed on your
     system, select the \uicontrol {Always use latest qmlls} check box.

doc/qtcreator/src/editors/creator-only/creator-markdown-editor.qdoc

@@ -19,4 +19,10 @@
     To hide and show the views, select \uicontrol {Show Preview} and
     \uicontrol {Show Editor}. To swap the places of the views, select
     \uicontrol {Swap Views}.
+
+    \section1 Formatting Text
+
+    Use the buttons on the editor toolbar to format text as italic (i), bold (b),
+    or inline code (`), and to create links to web sites
+    (\inlineimage icons/linkicon.png).
 */

doc/qtcreator/src/editors/creator-only/creator-mime-types.qdoc

@@ -46,7 +46,7 @@
 
     \list 1
 
-        \li Select \uicontrol Edit > \uicontrol Preferences >
+        \li Select \preferences >
             \uicontrol Environment > \uicontrol {MIME Types}.
 
             \image qtcreator-mime-types.png "MIME Types"

doc/qtcreator/src/editors/creator-only/creator-preferences-cpp-code-style.qdoc

@@ -18,7 +18,7 @@
     To specify global indentation settings for the C++ editor:
 
     \list 1
-        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol {C++}.
+        \li Select \preferences > \uicontrol {C++}.
             \image qtcreator-code-style-clang-format-global.webp {Code Style preferences}
         \li In \uicontrol {Formatting mode}, select:
             \list

doc/qtcreator/src/editors/creator-only/creator-preferences-nim.qdoc

@@ -14,7 +14,7 @@
     To specify settings for the Nim editor (experimental):
 
     \list 1
-        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Nim.
+        \li Select \preferences > \uicontrol Nim.
         \li In the \uicontrol {Current settings} field, select the settings to
             modify and click \uicontrol Copy.
             \image qtcreator-options-code-style-nim.png {Nim Code Style preferences}
@@ -29,6 +29,6 @@
     To specify different settings for a particular project, select
     \uicontrol Projects > \uicontrol {Code Style}.
 
-    \sa {Find a particular preference}, {Indent text or code},
+    \sa {Find preferences}, {Indent text or code},
     {Specify code style}, {Setting Up Nimble}
 */

doc/qtcreator/src/editors/creator-only/creator-text-editing-macros.qdoc

@@ -24,12 +24,12 @@
     \uicontrol {Text Editing Macros} > \uicontrol {Save Last Macro}.
 
     To assign a keyboard shortcut to a text editing macro, select
-    \uicontrol Edit > \uicontrol Preferences > \uicontrol Environment >
+    \preferences > \uicontrol Environment >
     \uicontrol Keyboard. For more information, see \l{Assign keyboard shortcuts}.
 
     You can also use the \c rm locator filter to run a macro. For more
     information, see \l{Searching with the Locator}.
 
-    To view and remove saved macros, select \uicontrol Edit >
+    To view and remove saved macros, select \preferences >
-    \uicontrol Preferences > \uicontrol {Text Editor} > \uicontrol Macros.
+    \uicontrol {Text Editor} > \uicontrol Macros.
 */

doc/qtcreator/src/editors/creator-preferences-text-editor-behavior.qdoc

@@ -17,8 +17,8 @@
     \brief Set preferences for the behavior of the text editor.
 
     To specify indentation settings for text files that do not have C++ or
-    QML code (such as Python code files), select \uicontrol Edit >
+    QML code (such as Python code files), select \preferences >
-    \uicontrol Preferences > \uicontrol {Text Editor} > \uicontrol Behavior.
+    \uicontrol {Text Editor} > \uicontrol Behavior.
 
     \image qtcreator-indentation.png {Text Editor Behavior preferences}
 
@@ -64,7 +64,7 @@
 
     When you type text or code, it is indented automatically according to the
     selected text editor or code style preferences. To set typing preferences,
-    select \uicontrol Edit > \uicontrol Preferences > \uicontrol {Text Editor} >
+    select \preferences > \uicontrol {Text Editor} >
     \uicontrol Behavior > \uicontrol Typing.
 
     To disable automatic indentation, deselect the
@@ -89,7 +89,7 @@
     commenting out a selection, select \uicontrol {Prefer single line comments}.
 
     \if defined(qtcreator)
-    \sa {Find a particular preference}, {C++ Code Style}, {Nim}
+    \sa {Find preferences}, {C++ Code Style}, {Nim}
     \endif
 
     \sa {Indent text or code}, {Qt Quick Code Style}

doc/qtcreator/src/editors/creator-quick-fixes.qdoc

@@ -83,8 +83,7 @@
 
     You can specify settings for the refactoring actions either globally for
     all projects or separately for each project. To specify global options,
-    select \uicontrol Edit > \uicontrol Preferences > \uicontrol C++ >
+    select \preferences > \uicontrol C++ > \uicontrol {Quick Fixes}.
-    \uicontrol {Quick Fixes}.
 
     To specify custom settings for a particular project, select
     \uicontrol Projects > \uicontrol {Project Settings} >
@@ -728,7 +727,7 @@
 
                 By default, \QC uses the \c auto variable type when creating the
                 variable. To label the variable with its actual type, select
-                \uicontrol Edit > \uicontrol Preferences > \uicontrol C++ >
+                \preferences > \uicontrol C++ >
                 \uicontrol {Quick Fixes}, and then deselect the
                 \uicontrol {Use type "auto" when creating new variables} check
                 box.

doc/qtcreator/src/editors/creator-search.qdoc

@@ -95,7 +95,7 @@
 
     The locations of search hits, breakpoints, and bookmarks in your document
     are highlighted on the editor scroll bar. To turn highlighting off, select
-    \uicontrol Edit > \uicontrol Preferences > \uicontrol {Text Editor} >
+    \preferences > \uicontrol {Text Editor} >
     \uicontrol Display > \uicontrol {Highlight search results on the scrollbar}.
 
     To search using more advanced options, select \uicontrol Advanced.
@@ -243,11 +243,9 @@
 
         \li If Silver Searcher is not found, you might have installed it in a
             location that is not found via the \c{PATH} environment variable.
-            Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Environment >
+            Select \preferences > \uicontrol Environment > \uicontrol System,
-            \uicontrol System (or \uicontrol {\QC} > \uicontrol Preferences >
+            then select \uicontrol Change in the \uicontrol Environment field,
-            \uicontrol Environment > \uicontrol System on macOS), then select
+            and add the entry \c{PATH=/path/to/bin:${PATH}}.
-            \uicontrol Change in the \uicontrol Environment field and add an entry
-            \c{PATH=/path/to/bin:${PATH}}.
 
     \endlist
     \endif

doc/qtcreator/src/editors/creator-semantic-highlighting.qdoc

@@ -24,8 +24,7 @@
     \endlist
 
     To specify the color scheme to use for semantic highlighting, select
-    \uicontrol Edit > \uicontrol Preferences > \uicontrol {Text Editor} >
+    \preferences > \uicontrol {Text Editor} > \uicontrol {Fonts & Color}.
-    \uicontrol {Fonts & Color}.
 
     \QC supports syntax highlighting also for other types of files than C++,
     QML, or JavaScript.
@@ -48,7 +47,7 @@
     If more than one highlight definition is available for the file that you
     open for editing, the editor asks you to select the one to use. To save
     the selection, select \uicontrol {Remember My Choice}. To reset the
-    remembered definitions, select \uicontrol Edit > \uicontrol Preferences >
+    remembered definitions, select \preferences >
     \uicontrol {Text Editor} > \uicontrol {Generic Highlighter} >
     \uicontrol {Reset Remembered Definitions}.
 
@@ -58,10 +57,9 @@
     To view information about the downloaded files, open the \l{View output}
     {General Messages} view.
 
-    To suppress the message for a particular file pattern, select
+    To suppress the message for a particular file pattern, select \preferences >
-    \uicontrol Edit > \uicontrol Preferences > \uicontrol {Text Editor}
+    \uicontrol {Text Editor} > \uicontrol {Generic Highlighter} and add the
-    > \uicontrol {Generic Highlighter} and add the pattern to the
+    pattern to the \uicontrol {Ignored file patterns} field.
-    \uicontrol {Ignored file patterns} field.
 
     \image qtcreator-syntax-highlighter.png "Generic Highlighter preferences"
 
@@ -71,7 +69,7 @@
     apply the changes you make to the definition files, select
     \uicontrol {Reload Definitions}.
 
-    \section1 Highlighting and Folding Blocks
+    \section1 Highlighting Blocks
 
     Use block highlighting to visually separate parts of the code that belong
     together. For example, when you place the cursor within the braces, the code
@@ -79,24 +77,36 @@
 
     \image qtcreator-blockhighlighting.png
 
-    To enable block highlighting, select \uicontrol Edit >
+    To enable block highlighting, select \preferences > \uicontrol {Text Editor}
-    \uicontrol Preferences > \uicontrol {Text Editor} > \uicontrol Display >
+    > \uicontrol Display > \uicontrol {Highlight blocks}.
-    \uicontrol {Highlight blocks}.
+
+    \section1 Folding Blocks
 
     Use the folding markers to collapse and expand blocks of code within braces.
     Click the folding marker to collapse or expand a block. In the figure above,
     the folding markers are located between the line number and the text pane.
 
-    To show the folding markers, select \uicontrol Edit > \uicontrol Preferences >
+    To show the folding markers, select \preferences >
     \uicontrol {Text Editor} > \uicontrol Display >
     \uicontrol {Display folding markers}. This option is enabled by default.
 
     \image qtcreator-options-text-editor-display.png "Text Editor Display preferences"
 
-    When the cursor is on a brace, the matching brace is animated by default. To
+    \section2 Folding All Comment Blocks
-    turn off the animation and just highlight the block and the braces, select
+
-    \uicontrol Edit > \uicontrol Preferences > \uicontrol {Text Editor} >
+    To fold all comment blocks, select \uicontrol Tools > \uicontrol C++ >
-    \uicontrol Display and deselect \uicontrol {Animate matching parentheses}.
+    \uicontrol {Fold All Comment Blocks}. To unfold all comment blocks, select
+    \uicontrol {Unfold All Comment Blocks}.
+
+    \section1 Animating Matching Braces
+
+    When the cursor is on a brace, the matching brace is animated by default.
+
+    To turn off the animation and just highlight the block and the braces, select
+    \preferences > \uicontrol {Text Editor} > \uicontrol Display and deselect
+    \uicontrol {Animate matching parentheses}.
+
+    \section1 Moving Between Blocks
 
     You can use keyboard shortcuts to move within and between blocks. To go to
     block end, press \key {Ctrl+]} and to go to block start, press
@@ -104,11 +114,15 @@
     or beginning of the block, press \key {Ctrl+Shift+]} and
     \key {Ctrl+Shift+[}, respectively.
 
+    \section1 Selecting the Current Block
+
     To select the current block, press \key Ctrl+U. A second key press extends
     the selection to the parent block. To undo the last selection, press
-    \key {Ctrl+Alt+Shift+U}. To enable smart block selection, select
+    \key {Ctrl+Alt+Shift+U}.
-    \uicontrol Edit > \uicontrol Preferences > \uicontrol {Text Editor} >
+
-    \uicontrol Behavior > \uicontrol {Enable smart selection changing}.
+    To enable smart block selection, select \preferences
+    > \uicontrol {Text Editor} > \uicontrol Behavior >
+    \uicontrol {Enable smart selection changing}.
 
     \image qtcreator-options-text-editor-behavior.png "Text Editor Behavior preferences"
 */

doc/qtcreator/src/howto/creator-external-tools.qdoc

@@ -31,7 +31,7 @@
     \section1 Configure external tools
 
     You can change the configuration of preconfigured tools and configure
-    additional tools in \QC \uicontrol Preferences.
+    additional tools in \QC \preferences.
 
     \image qtcreator-external-tools.png
 
@@ -90,7 +90,7 @@
 
 
             To globally change the system environment from the one in which
-            \QC is started, select \uicontrol Edit > \uicontrol Preferences >
+            \QC is started, select \preferences >
             \uicontrol Environment > \uicontrol System, and then select
             \uicontrol Change in the \uicontrol Environment field.
             \if defined(qtcreator)

doc/qtcreator/src/howto/creator-help.qdoc

@@ -36,7 +36,7 @@
             space, in the fullscreen \uicontrol Help mode.
 
         \li To select and configure how the documentation is displayed in the
-            \uicontrol Help mode, select \uicontrol Edit > \uicontrol Preferences > \uicontrol Help.
+            \uicontrol Help mode, select \preferences > \uicontrol Help.
     \endlist
 
     The following image displays the context sensitive help in the \uicontrol Edit
@@ -47,8 +47,8 @@
     \section1 Change the font
 
     If the help HTML file does not use a style sheet, you can change the font
-    family, style, and size in \uicontrol Edit > \uicontrol Preferences >
+    family, style, and size in \preferences > \uicontrol Help >
-    \uicontrol Help > \uicontrol General.
+    \uicontrol General.
 
     \image qtcreator-preferences-help-general.webp {General tab in Help preferences}
 
@@ -74,8 +74,8 @@
 
     \section1 View function tooltips
 
-    To hide function tooltips by default, select \uicontrol Edit >
+    To hide function tooltips by default, select \preferences >
-    \uicontrol Preferences > \uicontrol {Text Editor} > \uicontrol Behavior >
+    \uicontrol {Text Editor} > \uicontrol Behavior >
     \uicontrol {Show help tooltips using the mouse} >
     \uicontrol {On Shift+Mouseover}. You can still view the tooltips by pressing
     and holding down the \key Shift key.
@@ -108,9 +108,8 @@
 
     By default, \QC registers only the latest available version of the
     documentation for each installed Qt module. To register all installed
-    documentation, select \uicontrol Edit > \uicontrol Preferences >
+    documentation, select \preferences > \uicontrol Kits >
-    \uicontrol Kits > \uicontrol {Qt Versions} >
+    \uicontrol {Qt Versions} > \uicontrol {Register documentation}.
-    \uicontrol {Register documentation}.
 
     \image qtcreator-qt-versions.png {Register documentation field in Qt Versions tab in Kit Preferences}
 
@@ -174,9 +173,9 @@
 
     \section1 Import and export bookmarks
 
-    To import and export bookmarks, select \uicontrol Edit > \uicontrol Preferences
+    To import and export bookmarks, select \preferences >
-     > \uicontrol Help > \uicontrol General > \uicontrol {Import Bookmarks} or
+    \uicontrol Help > \uicontrol General > \uicontrol {Import Bookmarks} or
-     \uicontrol {Export Bookmarks}.
+    \uicontrol {Export Bookmarks}.
 
     \sa {Find information in Qt documentation}
 */
@@ -260,7 +259,7 @@
             For information on how to prepare your documentation and create a
             .qch file, see \l{The Qt Help Framework}.
 
-        \li To add the .qch file to \QC, select \uicontrol Edit > \uicontrol Preferences >
+        \li To add the .qch file to \QC, select \preferences >
             \uicontrol Help > \uicontrol Documentation > \uicontrol Add.
 
             \image qtcreator-preferences-help-documentation.webp {Documentation tab in Help Preferences}
@@ -289,8 +288,8 @@
     \image qtcreator-context-sensitive-help.png {Context-sensitive help in Edit mode}
 
     To specify that the help always opens in full-screen mode or
-    is detached to an external window, select \uicontrol Edit >
+    is detached to an external window, select \preferences > \uicontrol Help >
-    \uicontrol Preferences > \uicontrol Help > \uicontrol General.
+    \uicontrol General.
 
     \image qtcreator-preferences-help-general.webp {General tab in Help preferences}
 
@@ -317,8 +316,8 @@
     \title Select the help start page
 
     You can select the page to display when you open the \uicontrol Help mode in the
-    \uicontrol Edit > \uicontrol Preferences > \uicontrol Help > \uicontrol General
+    \preferences > \uicontrol Help > \uicontrol General >
-    > \uicontrol {On help start} field.
+    \uicontrol {On help start} field.
 
     \image qtcreator-preferences-help-general.webp {General tab in Help preferences}
 
@@ -367,8 +366,7 @@
 
     \list 1
 
-        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Help >
+        \li Select \preferences > \uicontrol Help > \uicontrol Filters.
-            \uicontrol Filters.
 
             \image qtcreator-help-filter-attributes.png {Filters tab in Help preferences}
 

doc/qtcreator/src/howto/creator-how-to-find-preferences.qdoc

@@ -0,0 +1,33 @@
+// Copyright (C) 2023 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
+
+/*!
+    \page creator-how-to-find-preferences.html
+    \if defined(qtcreator)
+    \previouspage creator-how-tos.html
+    \else
+    \previouspage creator-quick-tour.html
+    \endif
+
+    \ingroup creator-how-to-ui
+    \ingroup studio-how-to
+
+    \title Find preferences
+
+    \QC uses standard names and locations on Linux, \macos, and Windows for
+    standard features, such as \e preferences.
+
+    \table
+        \header
+            \li Linux and Windows
+            \li \macos
+        \row
+            \li \uicontrol Edit > \uicontrol Preferences
+            \li \uicontrol {\QC} > \uicontrol Preferences
+    \endtable
+
+    To find a particular preference, use the filter located at the top left of
+    the \uicontrol Preferences dialog.
+
+    \image qtcreator-preferences.webp {Filtering preferences}
+*/

doc/qtcreator/src/howto/creator-how-to-macos.qdoc

@@ -1,38 +0,0 @@
-// Copyright (C) 2023 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
-
-/*!
-    \page creator-how-to-macos.html
-    \if defined(qtcreator)
-    \previouspage creator-how-tos.html
-    \else
-    \previouspage creator-quick-tour.html
-    \endif
-
-    \ingroup creator-how-to-ui
-    \ingroup studio-how-to
-
-    \title Find menu items on \macos
-
-    \QC uses standard names and locations for standard features, such as
-    \e preferences. In this manual, the names and locations on
-    Windows and Linux are usually used to keep the instructions short. Here are
-    some places to check if you cannot find a function, dialog, or keyboard
-    shortcut on \macos when following the instructions:
-
-    \table
-        \header
-            \li For
-            \li Look In
-        \row
-            \li \uicontrol Edit > \uicontrol Preferences
-            \li \uicontrol {\QC} > \uicontrol Preferences
-        \row
-            \li \uicontrol Help > \uicontrol {About Plugins}
-            \li \uicontrol {\QC} > \uicontrol {About Plugins}
-        \row
-            \li Keyboard shortcuts
-            \li \uicontrol {\QC} > \uicontrol Preferences > \uicontrol Environment >
-                \uicontrol Keyboard
-    \endtable
-*/

doc/qtcreator/src/howto/creator-how-to-set-high-dpi-scaling.qdoc

@@ -15,27 +15,30 @@
     \title Set high DPI scaling
 
     The operating systems that \QC supports implement high dots-per-inch (DPI)
-    scaling at varying levels. Therefore, \QC handles high DPI scaling
+    scaling at varying levels. Therefore, \QC handles \l{High DPI}{high DPI}
-    differently on different operating systems:
+    scaling differently on different operating systems:
 
     \list
         \li On \macos, \QC forces high DPI scaling, which means that it allows
             Qt to use the system scaling factor as the \QC scaling factor.
-        \li On Windows, if you do not set \l{High DPI}
-            {scaling environment variables}, \QC instructs Qt to detect the
-            scaling factor and use it as the \QC scaling factor.
         \li On Linux, \QC leaves it to the user to enable high DPI scaling
             because the process varies so much on different distributions
             and windowing systems that it cannot be reliably done automatically.
     \endlist
 
-    To override the default approach and always enable high DPI scaling:
+    Setting the scale factor or DPI to the exact physical display DPI may not
+    give good visual results due to the fractional scaling involved.
+    \l {Qt::HighDpiScaleFactorRoundingPolicy}{Rounding} the scale factor to 25%
+    increments can improve the results.
+
+    To set the DPI rounding policy:
 
         \list 1
-            \li Select \uicontrol Edit > \uicontrol Preferences >
+            \li Select \preferences >
                 \uicontrol Environment > \uicontrol Interface.
                 \image qtcreator-preferences-environment-interface.webp {Interface tab in Environment preferences}
-            \li Select \uicontrol {Enable high DPI scaling}.
+            \li In \uicontrol {DPI rounding policy}, select an option to round
+                DPI up or down.
             \li Restart \QC to have the change take effect.
     \endlist
 */

doc/qtcreator/src/howto/creator-how-to-switch-ui-themes.qdoc

@@ -20,7 +20,7 @@
     To switch themes:
 
     \list 1
-        \li Select \uicontrol Edit > \uicontrol Preferences >
+        \li Select \preferences >
             \uicontrol Environment > \uicontrol Interface.
             \image qtcreator-preferences-environment-interface.webp {Interface preferences}
         \li In \uicontrol Theme, select a theme.

doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc

@@ -24,8 +24,7 @@
 
     \QC has various keyboard shortcuts that speed up your development process.
     To view all \QC functions in and their keyboard shortcuts, select
-    \uicontrol Edit > \uicontrol Preferences > \uicontrol Environment >
+    \preferences > \uicontrol Environment > \uicontrol Keyboard.
-    \uicontrol Keyboard.
 
     \image qtcreator-keyboard-shortcuts.png
 
@@ -47,7 +46,7 @@
 
     To override the platform default value that determines whether
     keyboard shortcuts are shown in the labels of context menu items,
-    select \uicontrol Edit > \uicontrol Preferences > \uicontrol Environment >
+    select \preferences > \uicontrol Environment >
     \uicontrol Interface. The label of the \uicontrol {Show keyboard shortcuts
     in context menus} check box indicates whether the platform default value
     is \c on or \c off.
@@ -218,8 +217,8 @@
                  By default, \QC exits without asking for confirmation, unless
                  there are unsaved changes in open files. To always be asked,
                  select the \uicontrol {Ask for confirmation before exiting}
-                 check box in \uicontrol Edit > \uicontrol Preferences >
+                 check box in \preferences > \uicontrol Environment >
-                 \uicontrol Environment > \uicontrol System.
+                 \uicontrol System.
             \li  Ctrl+Q
     \endtable
 
@@ -316,9 +315,8 @@
             \li  Select the current block
 
                  The second press extends the selection to the parent block. To
-                 enable this behavior, select \uicontrol Edit >
+                 enable this behavior, select \preferences >
-                 \uicontrol Preferences > \uicontrol {Text Editor} >
+                 \uicontrol {Text Editor} > \uicontrol Behavior >
-                 \uicontrol Behavior >
                  \uicontrol {Enable smart selection changing}.
             \li  Ctrl+U
         \row
@@ -819,8 +817,7 @@
 
     \list 1
 
-        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Environment
+        \li Select \preferences > \uicontrol Environment > \uicontrol Keyboard.
-            > \uicontrol Keyboard.
             \image qtcreator-keyboard-shortcuts.png {Keyboard preferences}
 
         \li Select a command from the list.
@@ -877,8 +874,7 @@
     To look up keyboard shortcuts:
 
     \list 1
-        \li Select uicontrol Edit > \uicontrol Preferences >
+        \li Select \preferences > \uicontrol Environment > \uicontrol Keyboard.
-            \uicontrol Environment > \uicontrol Keyboard.
             \image qtcreator-keyboard-shortcuts.png {Keyboard preferences}
         \li Start typing the name of a function or shortcut in the
             \uicontrol Filter field.
@@ -909,8 +905,7 @@
 
     \list 1
 
-        \li Select uicontrol Edit > \uicontrol Preferences >
+        \li Select \preferences > \uicontrol Environment > \uicontrol Keyboard.
-            \uicontrol Environment > \uicontrol Keyboard.
             \image qtcreator-keyboard-shortcuts.png {Keyboard preferences}
 
         \li To import a keyboard shortcut mapping scheme, click \uicontrol Import

doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc

@@ -39,7 +39,7 @@
 
     By default, \QC does not handle build system based tests to avoid
     interference with code based parsers. To enable build system based tests,
-    select the respective test tool in \uicontrol Preferences > \uicontrol Testing
+    select the respective test tool in \preferences > \uicontrol Testing
     > \uicontrol General.
 
     The detection of tests is usually much faster for build system based
@@ -341,8 +341,8 @@
             with the build system.
 
     If a test takes more than a minute to execute, the default timeout might
-    stop the test execution. To increase the timeout, select \uicontrol Edit >
+    stop the test execution. To increase the timeout, select \preferences >
-    \uicontrol Preferences > \uicontrol {Testing} > \uicontrol General.
+    \uicontrol {Testing} > \uicontrol General.
 
     \section2 Selecting Tests to Run
 
@@ -389,8 +389,7 @@
     \section1 Specifying Test Settings
 
     To customize the handling of tests, test frameworks, and test tools, select
-    \uicontrol Edit > \uicontrol Preferences > \uicontrol {Testing} >
+    \preferences > \uicontrol {Testing} > \uicontrol General.
-    \uicontrol General.
 
     \image qtcreator-preferences-testing-general.webp {General tab in Testing preferences}
 
@@ -444,8 +443,8 @@
     The code inside a benchmark test is measured, and possibly also repeated
     several times in order to get an accurate measurement. This depends on the
     measurement back-end that you can select in the
-    \uicontrol {Benchmark Metrics} group in \uicontrol Edit >
+    \uicontrol {Benchmark Metrics} group in \preferences > \uicontrol {Testing} >
-    \uicontrol Preferences > \uicontrol {Testing} > \uicontrol {Qt Test}:
+    \uicontrol {Qt Test}:
     walltime, CPU tick counter, event counter, Valgrind Callgrind, and Linux
     Perf. For more information, see \l{Creating a Benchmark}.
 
@@ -472,8 +471,8 @@
 
     \section2 Specifying Settings for Running Google Tests
 
-    To specify settings for running Google tests, select \uicontrol Edit >
+    To specify settings for running Google tests, select \preferences >
-    \uicontrol Preferences > \uicontrol {Testing} > \uicontrol {Google Test}.
+    \uicontrol {Testing} > \uicontrol {Google Test}.
 
     \image qtcreator-preferences-testing-googletest.webp {Gooble Test tab in Testing preferences}
 
@@ -500,9 +499,8 @@
     \section2 Specifying Settings for Running Boost Tests
 
     \list 1
-        \li To specify settings for running Boost tests, select \uicontrol Edit
+        \li To specify settings for running Boost tests, select \preferences >
-            > \uicontrol Preferences > \uicontrol {Testing} >
+            \uicontrol {Testing} > \uicontrol {Boost Test}.
-            \uicontrol {Boost Test}.
             \image qtcreator-preferences-testing-boosttest.webp {Boost Test tab in Testing preferences}
         \li In the \uicontrol {Log format} field, select the error report
             format to specify the type of events to record in the
@@ -526,8 +524,7 @@
     \section2 Specifying Settings for Running Catch2 Tests
     \list 1
         \li To specify settings for running Catch2 tests, select
-            \uicontrol Edit > \uicontrol Preferences > \uicontrol {Testing} >
+            \preferences > \uicontrol {Testing} > \uicontrol {Catch Test}.
-            \uicontrol {Catch Test}.
             \image qtcreator-preferences-testing-catchtest.webp {Catch Test tab in Testing preferences}
         \li Select the \uicontrol {Show success} check box to show succeeding
             expressions as well. By default Catch2 will print only fails.
@@ -557,8 +554,7 @@
     \section2 Specifying Settings for Running CTest-Based Tests
     \list 1
         \li To specify settings for running CTest-based tests, select
-        \uicontrol Edit > \uicontrol Preferences > \uicontrol {Testing} >
+            \preferences > \uicontrol {Testing} > \uicontrol {CTest}.
-        \uicontrol {CTest}.
             \image qtcreator-preferences-testing-ctest.webp {CTest tab in Testing preferences}
         \li Select the \uicontrol {Output on failure} check box to show test
             specific output if a test fails. Contrary to the CTest default
@@ -595,8 +591,8 @@
     the lost information when viewing the results as plain text.
 
     To view the
-    results of Qt and Qt Quick tests as plain text, select \uicontrol Edit >
+    results of Qt and Qt Quick tests as plain text, select \preferences >
-    \uicontrol Preferences > \uicontrol {Testing} > \uicontrol {Qt Test}, and
+    \uicontrol {Testing} > \uicontrol {Qt Test}, and
     then deselect the \uicontrol {Use XML output} check box. Then select the
     \inlineimage icons/text.png
     (\uicontrol {Switch Between Visual and Text Display}) button in

doc/qtcreator/src/howto/creator-only/creator-how-to-document-code.qdoc

@@ -20,7 +20,7 @@
 
     \image qtcreator-preferences-documentation-comments.webp {Documentation Comments settings}
 
-    To set global preferences, select \uicontrol Edit > \uicontrol Preferences >
+    To set global preferences, select \preferences >
     \uicontrol {Text Editor} > \uicontrol {Documentation Comments}.
 
     \sa {Configuring Projects}

doc/qtcreator/src/howto/creator-only/creator-how-to-record-screens.qdoc

@@ -106,8 +106,7 @@
     To set up screen recording:
 
     \list 1
-        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Help >
+        \li Select \preferences > \uicontrol Help > \uicontrol {Screen Recording}.
-            \uicontrol {Screen Recording}.
             \image qtcreator-preferences-screen-recording.webp {Screen Recording preferences}
         \li In \uicontrol {ffmpeg tool}, set the path to the FFmpeg executable.
         \li In \uicontrol {ffprobe tool}, set the path to the FFprobe executable.

doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc

@@ -95,20 +95,6 @@
     \endlist
 */
 
-/*!
-    \page creator-how-to-find-preferences.html
-    \previouspage creator-how-tos.html
-
-    \ingroup creator-how-to-ui
-
-    \title Find a particular preference
-
-    To find a particular preference in \uicontrol Edit > \uicontrol Preferences,
-    use the filter located at the top left of the \uicontrol Preferences dialog.
-
-    \image qtcreator-preferences.webp {Filtering preferences}
-*/
-
 /*!
     \page creator-how-to-run-from-cli.html
     \previouspage creator-how-tos.html
@@ -208,7 +194,7 @@
     create your own locator filters. That way you can locate files in a
     directory structure you have defined.
 
-    To create locator filters, select \uicontrol Edit > \uicontrol Preferences >
+    To create locator filters, select \preferences >
     \uicontrol Environment > \uicontrol Locator > \uicontrol Add.
 
     \image qtcreator-locator-customize.webp "Locator preferences"
@@ -253,9 +239,8 @@
 
     \title Add a license header template for C++ code
 
-    Specify a file that has a license header for C++ in \uicontrol Edit >
+    Specify a file that has a license header for C++ in \preferences >
-    \uicontrol Preferences > \uicontrol C++ > \uicontrol {File Naming} >
+    \uicontrol C++ > \uicontrol {File Naming} > \uicontrol {License template}.
-    \uicontrol {License template}.
 
     \image qtcreator-options-cpp-files.png "File Naming preferences"
 
@@ -321,8 +306,7 @@
     \endlist
 
     To specify whether to automatically insert matching characters,
-    select \uicontrol Edit > \uicontrol Preferences >
+    select \preferences > \uicontrol {Text Editor} > \uicontrol Completion.
-    \uicontrol {Text Editor} > \uicontrol Completion.
 
     \image qtcreator-preferences-texteditor-completion.webp "Completion preferences"
 
@@ -349,8 +333,8 @@
     \title Add code snippets to the auto-complete menu
 
     Add, modify, and remove snippets in the snippet editor.
-    To open the editor, select \uicontrol Edit > \uicontrol Preferences
+    To open the editor, select \preferences > \uicontrol {Text Editor} >
-    > \uicontrol {Text Editor} > \uicontrol Snippets.
+    \uicontrol Snippets.
 
     \image qtcreator-snippet-modifiers.png "Snippets preferences"
 
@@ -398,8 +382,7 @@
     \uicontrol {Recent Files}:
 
     \list 1
-        \li Select \uicontrol Edit > \uicontrol Preferences >
+        \li Select \preferences > \uicontrol Environment > \uicontrol System.
-            \uicontrol Environment > \uicontrol System.
             \image qtcreator-options-environment-system.png {System preferences}
         \li In \uicontrol {Maximum number of entries in "Recent Files"}, set
             the number of files to show.

doc/qtcreator/src/howto/creator-only/creator-squish.qdoc

@@ -57,7 +57,7 @@
     To specify a Squish Server to run:
 
     \list 1
-        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Squish.
+        \li Select \preferences > \uicontrol Squish.
             \image qtcreator-squish-preferences.png "Squish general preferences"
         \li In the \uicontrol {Squish path} field, specify the path to the Squish
             installation directory.

doc/qtcreator/src/howto/creator-only/creator-vcpkg.qdoc

@@ -31,15 +31,13 @@
     \section1 Setting vcpkg Preferences
 
     By default, vcpkg is automatically set up for use with CMake. To disable
-    automatic setup, select \uicontrol Edit > \uicontrol Preferences >
+    automatic setup, select \preferences > \uicontrol CMake > \uicontrol General
-    \uicontrol CMake > \uicontrol General >
+    > \uicontrol {Package manager auto setup}.
-    \uicontrol {Package manager auto setup}.
 
     \image qtcreator-preferences-cmake-general.webp {General tab in CMake Preferences}
 
     To set the \uicontrol Path to the directory where you installed vcpkg, select
-    \uicontrol Edit > \uicontrol Preferences > \uicontrol CMake >
+    \preferences > \uicontrol CMake > \uicontrol Vcpkg.
-    \uicontrol Vcpkg.
 
     \image qtcreator-preferences-cmake-vcpkg.webp {Vcpkg tab in CMake Preferences}
 

doc/qtcreator/src/howto/creator-only/qtcreator-faq.qdoc

@@ -34,7 +34,7 @@
     compiler. What should I do?}
 
     Make sure that the application is in your system PATH when starting \QC.
-    Also select \uicontrol Edit > \uicontrol Preferences to check the settings
+    Also select \preferences to check the settings
     specified for the application. Many plugins specify either the path to the
     tool they need or the environment they run in.
 
@@ -45,7 +45,7 @@
 
     \QC has been localized into several languages. If the system
     language is one of the supported languages, it is automatically selected.
-    To change the language, select \uicontrol Edit > \uicontrol Preferences >
+    To change the language, select \preferences >
     \uicontrol Environment and select a language in the \uicontrol Language
     field. Select \uicontrol {Restart Now} to restart \QC and have the change
     take effect.
@@ -145,7 +145,7 @@
     \uicontrol Help mode.
 
     To view the documentation that is available and to add documentation,
-    select \uicontrol Edit > \uicontrol Preferences > \uicontrol Help >
+    select \preferences > \uicontrol Help >
     \uicontrol Documentation. For more information, see
     \l{Add external documentation}.
 
@@ -232,9 +232,9 @@
 
     For console applications that require input, select \uicontrol Projects >
     \uicontrol {Run Settings} > \uicontrol {Run in terminal}. To specify the
-    terminal to use, select \uicontrol Edit > \uicontrol Preferences >
+    terminal to use, select \preferences >
     \uicontrol Environment > \uicontrol System. To use an \l{Terminal}
-    {internal terminal}, select \uicontrol Edit > \uicontrol Preferences
+    {internal terminal}, select \preferences
     > \uicontrol Terminal > \uicontrol {Use internal terminal}.
 
     \b {On Windows:} Output is displayed differently for \e{console

doc/qtcreator/src/howto/creator-telemetry.qdoc

@@ -90,7 +90,7 @@
     To determine what data is transmitted to the backend storage:
 
     \list 1
-        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Telemetry
+        \li Select \preferences > \uicontrol Telemetry
             > \uicontrol {Usage Statistics}.
             \image qtcreator-telemetry-settings.png "Telemetry settings"
         \li In the \uicontrol {Telemetry mode} list, select the mode that

doc/qtcreator/src/linux-mobile/b2qtdev.qdoc

@@ -34,7 +34,7 @@
     \section1 Adding Boot2Qt Devices
 
     If \QC does not automatically detect a device you connected with USB, select
-    \uicontrol Edit > \uicontrol Preferences > \uicontrol Devices >
+    \preferences > \uicontrol Devices >
     \uicontrol Devices > \uicontrol Add > \uicontrol {Boot2Qt Device} to create
     either a network connection or a USB connection to it.
 
@@ -49,7 +49,7 @@
     \l{https://doc.qt.io/Boot2Qt/b2qt-requirements-x11.html#setting-up-usb-access-to-embedded-devices}
     {Boot2Qt: Setting Up USB Access to Embedded Devices}.
 
-    You can edit the settings later in \uicontrol Edit > \uicontrol Preferences >
+    You can edit the settings later in \preferences >
     \uicontrol Devices > \uicontrol Devices.
 
     To reboot the selected device, select \uicontrol {Reboot Device}.
@@ -74,7 +74,7 @@
     need to enter the password upon every connection to the device, or if
     caching is enabled, at every \QC restart. If you frequently run into the
     timeout, consider using key-based authentication. On \macos and Linux, you
-    can also select \uicontrol Preferences > \uicontrol Devices > \uicontrol SSH
+    can also select \preferences > \uicontrol Devices > \uicontrol SSH
     and increase the time (in minutes) to use the same SSH connection in the
     \uicontrol {Connection sharing timeout} field. Windows does not support
     shared connections.
@@ -97,10 +97,9 @@
     \list 1
         \li Check that you can reach the IP address of the device, or use USB to
             connect it.
-        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits >
+        \li Select \preferences > \uicontrol Kits > \uicontrol {Qt Versions} >
-            \uicontrol {Qt Versions} > \uicontrol Add to add the Qt version
+            \uicontrol Add to add the Qt version for Boot2Qt.
-            for Boot2Qt.
+        \li Select \preferences > \uicontrol Kits >
-        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits >
             \uicontrol Compilers > \uicontrol Add to add the compiler for
             building the applications.
         \li Select \uicontrol Tools > \uicontrol {Flash Boot to Qt Device}
@@ -109,16 +108,15 @@
             parameters for connecting to the devices over the network (\QC
             automatically detects devices connected with USB):
             \list 1
-                \li Select \uicontrol Edit > \uicontrol Preferences >
+                \li Select \preferences > \uicontrol Devices >
-                    \uicontrol Devices > \uicontrol Devices > \uicontrol Add >
+                    \uicontrol Devices > \uicontrol Add > \uicontrol Boot2Qt.
-                    \uicontrol Boot2Qt.
                     \image qtcreator-devices-boot2qt.png {Boot2Qt Network Device Setup wizard}
                 \li In the \uicontrol {Device name} field, enter a name for
                     the connection.
                 \li In the \uicontrol {Device address} field, enter the host
                     name or IP address of the device. This value will be
                     available in the \c %{Device:HostAddress} variable.
-                \li Click  > \uicontrol {Finish} to test the connection and
+                \li Click \uicontrol {Finish} to test the connection and
                     add the device.
 
                     You can edit the connection parameters in the
@@ -131,7 +129,7 @@
                     \uicontrol {Boot2Qt Device} in the pull-down menu of the
                     \uicontrol Add button.
             \endlist
-        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits >
+        \li Select \preferences > \uicontrol Kits >
             \uicontrol Add to add a kit for building applications for the
             device. Select the Qt version, compiler, and device that you
             added above, and choose \uicontrol Boot2Qt as the device type.

doc/qtcreator/src/linux-mobile/linuxdev-keys.qdocinc

@@ -19,8 +19,8 @@
     development PC.
 
     To tell \QC where it can find the tools, specify the paths to the
-    directories where the tools are installed in \uicontrol Edit >
+    directories where the tools are installed in \preferences >
-    \uicontrol Preferences > \uicontrol Devices > \uicontrol SSH:
+    \uicontrol Devices > \uicontrol SSH:
 
     \image qtcreator-ssh-options.png "SSH preferences"
 
@@ -60,7 +60,7 @@
 
     \list 1
 
-        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Devices
+        \li Select \preferences > \uicontrol Devices
             > \uicontrol Devices > \uicontrol {Create New}.
 
             \image qtcreator-ssh-key-configuration.png "SSH Key Configuration dialog"

doc/qtcreator/src/linux-mobile/linuxdev-processes.qdocinc

@@ -7,7 +7,7 @@
     \section2 Managing Device Processes
 
     You can view processes running on devices and kill them. Select
-    \uicontrol Edit > \uicontrol Preferences > \uicontrol Devices >
+    \preferences > \uicontrol Devices >
     \uicontrol Devices > \uicontrol {Show Running Processes}.
 
     You can filter the processes by name or ID in the

doc/qtcreator/src/linux-mobile/linuxdev.qdoc

@@ -22,7 +22,7 @@
     {kit}.
 
     You use a wizard to create the connections. You can edit the settings later
-    in \uicontrol Edit > \uicontrol Preferences > \uicontrol Devices >
+    in \preferences > \uicontrol Devices >
     \uicontrol Devices.
 
     \image qtcreator-preferences-devices-remote-linux.webp "Remote Linux Device in the Devices tab"
@@ -49,11 +49,11 @@
 
         \li Make sure that your device can be reached via an IP address.
 
-        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits >
+        \li Select \preferences > \uicontrol Kits >
             \uicontrol {Qt Versions} > \uicontrol Add to add the Qt version
             for embedded Linux.
 
-        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits >
+        \li Select \preferences > \uicontrol Kits >
             \uicontrol Compilers > \uicontrol Add to add the compiler for
             building the applications.
 
@@ -62,7 +62,7 @@
 
             \list a
 
-                \li Select \uicontrol Edit > \uicontrol Preferences >
+                \li Select \preferences >
                     \uicontrol Devices > \uicontrol Devices > \uicontrol Add >
                     \uicontrol {Remote Linux Device}
                     > \uicontrol {Start Wizard}.
@@ -111,7 +111,7 @@
            \uicontrol {Add Remote Linux Device} in the pull-down
            menu of the \uicontrol Add button.
 
-        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits >
+        \li Select \preferences > \uicontrol Kits >
             \uicontrol Add to add a kit for building for the device. Select the
             Qt version, compiler, and device that you added above, and select
             \uicontrol {Remote Linux Device} in \uicontrol {Run device type}.

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

@@ -60,8 +60,7 @@
     \section2 Specifying MCU Settings
 
     To configure a connection between \QC and your MCU board, select
-    \uicontrol Edit > \uicontrol Preferences > \uicontrol Devices >
+    \preferences > \uicontrol Devices > \uicontrol MCU:
-    \uicontrol MCU:
 
     \image qtcreator-mcu-options.png "MCU preferences"
 
@@ -121,9 +120,8 @@
 
     \image qtcreator-mcu-device.png "MCU devices"
 
-    To add MCU devices, select \uicontrol Edit > \uicontrol Preferences >
+    To add MCU devices, select \preferences > \uicontrol Devices > \uicontrol Add
-    \uicontrol Devices > \uicontrol Add > \uicontrol {MCU Device} >
+    > \uicontrol {MCU Device} > \uicontrol {Start Wizard}:
-    \uicontrol {Start Wizard}:
 
        \list 1
            \li In the \uicontrol Name field, give the device a name.
@@ -141,8 +139,7 @@
 
     \image qtcreator-mcu-kit.png "MCU kits"
 
-    You can edit and/or remove individual kits in \uicontrol Edit >
+    You can edit and/or remove individual kits in \preferences > \uicontrol Kits.
-    \uicontrol Preferences > \uicontrol Kits.
 
     However, for adding new kits you should use the \uicontrol {Create Kit}
     button in the {\QMCU} settings tab. This method adds the paths to

doc/qtcreator/src/meson/creator-projects-meson.qdoc

@@ -35,7 +35,7 @@
 
     \list 1
 
-        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Meson >
+        \li Select \preferences > \uicontrol Meson >
             \uicontrol Tools > \uicontrol Add.
 
             \image qtcreator-mesonexecutable.png
@@ -50,7 +50,7 @@
     \endlist
 
     Select the
-    \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits > \uicontrol Kits
+    \preferences > \uicontrol Kits > \uicontrol Kits
     tab to add the Meson and Ninja tools to a build and run kit:
 
     \image qtcreator-kits-meson.png "Setting Meson executable in Kit preferences"

doc/qtcreator/src/overview/creator-only/creator-configuring.qdoc

@@ -45,22 +45,21 @@
     available in \QC. If it does not, you must add the kits yourself to tell
     \QC where everything is.
 
-    To add kits, select \uicontrol Edit > \uicontrol Preferences >
+    To add kits, select \preferences > \uicontrol Kits > \uicontrol Add.
-    \uicontrol Kits > \uicontrol Add.
 
     For more information, see \l{Add kits}.
 
     Each kit consists of a set of values that define one environment, such as a
-    \l{glossary-device}{device}, compiler, and Qt version. If \uicontrol Edit >
+    \l{glossary-device}{device}, compiler, and Qt version. If \preferences >
-    \uicontrol Preferences > \uicontrol Kits > \uicontrol {Qt Versions} does not
+    \uicontrol Kits > \uicontrol {Qt Versions} does not show all the installed
-    show all the installed Qt versions, select \uicontrol {Link with Qt}.
+    Qt versions, select \uicontrol {Link with Qt}.
 
     If \uicontrol Auto-detected still does not show the Qt version, select
     \uicontrol {Add} to add it manually.
 
     For more information, see \l{Add Qt versions}.
 
-    Also check that \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits >
+    Also check that \preferences > \uicontrol Kits >
     \uicontrol {Compilers} shows your compiler.
 
     For more information, see \l{Add compilers}.
@@ -71,8 +70,8 @@
     over a WLAN. You must also configure a connection between \QC and the
     development PC and specify the device in a kit.
 
-    To add devices, select \uicontrol Edit > \uicontrol Preferences >
+    To add devices, select \preferences > \uicontrol Devices >
-    \uicontrol Devices > \uicontrol Devices > \uicontrol Add.
+    \uicontrol Devices > \uicontrol Add.
 
     For more information, see \l{Connecting Devices}.
 
@@ -81,7 +80,8 @@
     You can use \QC with your favorite keyboard shortcuts.
 
     To view and edit all keyboard shortcuts defined in \QC, select
-    \uicontrol Edit > \uicontrol Preferences > \uicontrol Environment >
+    \preferences >
+    \uicontrol Environment >
     \uicontrol Keyboard. For more information, see \l{Keyboard Shortcuts}.
 
     \section1 Changing Color Schemes
@@ -89,9 +89,8 @@
     Themes enable you to customize the appearance of the \QC UI: widgets,
     colors, and icons.
 
-    To switch themes, select \uicontrol Edit > \uicontrol Preferences >
+    To switch themes, select \preferences > \uicontrol Environment, and then
-    \uicontrol Environment, and then select a theme
+    select a theme in the \uicontrol Theme field.
-    in the \uicontrol Theme field.
 
     You can use the \QC text and code editors with your favorite color scheme
     that defines how to highlight code elements and which background color to
@@ -99,7 +98,7 @@
     ones. The color schemes apply to highlighting C++ files, QML files, and
     generic files.
 
-    To change the color scheme, select \uicontrol Edit > \uicontrol Preferences >
+    To change the color scheme, select \preferences >
     \uicontrol {Text Editor} > \uicontrol {Fonts & Color}.
 
     For more information, see \l{Defining Color Schemes}.
@@ -109,8 +108,8 @@
     highlighting engine for Kate syntax definitions. \QC comes with most of
     the commonly used syntax files, and you can download additional files.
 
-    To download and use highlight definition files, select \uicontrol Edit >
+    To download and use highlight definition files, select \preferences >
-    \uicontrol Preferences > \uicontrol {Text Editor} > \uicontrol {Generic Highlighter}.
+    \uicontrol {Text Editor} > \uicontrol {Generic Highlighter}.
 
     For more information, see \l{Generic Highlighting}.
 
@@ -121,7 +120,7 @@
     the statement currently under your cursor. You can add, modify, and remove
     snippets in the snippet editor.
 
-    To open the snippet editor, select \uicontrol Edit > \uicontrol Preferences >
+    To open the snippet editor, select \preferences >
     \uicontrol {Text Editor} > \uicontrol Snippets.
 
     For more information, see \l{Editing Code Snippets}.
@@ -133,8 +132,8 @@
     \QC.
 
     However, some configuration options are available and you can set them in
-    \uicontrol Edit > \uicontrol Preferences > \uicontrol {Version Control} >
+    \preferences >
-    \uicontrol General.
+    \uicontrol {Version Control} > \uicontrol General.
 
     For more information about the supported functions, see
     \l{Version Control Systems}.

doc/qtcreator/src/overview/creator-only/creator-glossary.qdoc

@@ -78,7 +78,7 @@
                 cross-platform development easier. Each kit consists of a set
                 of values that define one environment, such as a \e {device},
                 tool chain, Qt version, and debugger command to use. Configure kits at
-                \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits.
+                \preferences > \uicontrol Kits.
 
         \row
             \li Mode

doc/qtcreator/src/overview/creator-only/creator-issues.qdoc

@@ -74,7 +74,7 @@
             \QC or the conflicting shortcut in ibus.
 
             To set another \l {Keyboard Shortcuts}{keyboard shortcut}
-            in \QC, select \uicontrol Edit > \uicontrol Preferences >
+            in \QC, select \preferences >
             \uicontrol Environment > \uicontrol Keyboard.
 
             To change the ibus shortcut, enter the following command on the

doc/qtcreator/src/overview/creator-only/creator-supported-platforms.qdoc

@@ -73,8 +73,7 @@
     To develop for UWP using Qt 5, use \QC 7.0, or earlier.
 
     \QC automatically runs scheduled checks for updates based on the settings
-    specified in \uicontrol Edit > \uicontrol Preferences \uicontrol Environment >
+    specified in \preferences > \uicontrol Environment > \uicontrol Update.
-    \uicontrol Update.
 
     \sa {Desktop Platforms}, {Embedded Platforms}, {Mobile Platforms}
 */

doc/qtcreator/src/projects/creator-only/creator-build-settings-qmake.qdoc

@@ -19,7 +19,7 @@
     \uicontrol {Build Directory} field.
 
     To make in-source builds the default option for all projects, select
-    \uicontrol Edit > \uicontrol Preferences > \uicontrol {Build & Run} >
+    \preferences > \uicontrol {Build & Run} >
     \uicontrol {Default Build Properties}, and enter a period (.) in the
     \uicontrol {Default build directory} field.
 
@@ -46,15 +46,13 @@
 
     \section1 Global qmake Settings
 
-    To specify settings for all qmake builds, select \uicontrol Edit
+    To specify settings for all qmake builds, select \preferences >
-    > \uicontrol Preferences > \uicontrol {Build & Run} >
+    \uicontrol {Build & Run} > \uicontrol Qmake.
-    \uicontrol Qmake.
 
     \image qtcreator-preferences-build-run-qmake.png "Qmake tab in Build & Run Preferences"
 
-    To set the default build properties, select \uicontrol Edit
+    To set the default build properties, select \preferences >
-    > \uicontrol Preferences > \uicontrol {Build & Run} >
+    \uicontrol {Build & Run} > \uicontrol {Default Build Properties}.
-    \uicontrol {Default Build Properties}.
 
     \image qtcreator-build-settings-default.png "Default Build Properties tab in Build & Run Preferences"
 
@@ -70,9 +68,8 @@
     select \uicontrol Enable in the \uicontrol {Qt Quick Compiler} field. To
     use default settings, select \uicontrol {Leave at Default}.
 
-    You can specify default behavior for compiling QML code in \uicontrol Edit
+    You can specify default behavior for compiling QML code in \preferences >
-    > \uicontrol Preferences > \uicontrol {Build & Run} > \uicontrol Qmake >
+    \uicontrol {Build & Run} > \uicontrol Qmake > \uicontrol {Use qmlcachegen}.
-    \uicontrol {Use qmlcachegen}.
 
     \section1 qmake Build Steps
 

doc/qtcreator/src/projects/creator-only/creator-custom-output-parser.qdoc

@@ -12,8 +12,7 @@
     and warning patterns that you specify and create entries
     for found patterns in \l Issues.
 
-    To view or add custom output parsers, select
+    To view or add custom output parsers, select \preferences >
-    \uicontrol Edit > \uicontrol Preferences >
     \uicontrol {Build & Run} > \uicontrol {Custom Output Parsers}.
 
     \image qtcreator-custom-parser-list.png
@@ -40,9 +39,8 @@
     To create a custom output parser:
 
     \list 1
-        \li Select \uicontrol Edit > \uicontrol Preferences >
+        \li Select \preferences > \uicontrol {Build & Run} >
-            \uicontrol {Build & Run} > \uicontrol {Custom Output Parsers}
+            \uicontrol {Custom Output Parsers} > \uicontrol Add.
-            > \uicontrol Add.
         \li In the \uicontrol {Error message capture pattern} field, specify
             a regular expression to define what is an error. The custom
             parser matches the compile output line by line against the

doc/qtcreator/src/projects/creator-only/creator-files-creating.qdoc

@@ -103,19 +103,34 @@
 
     You can also create your own project and class wizards.
 
-    \section1 Set file naming preferences
+    \sa {Create files}, {Set C++ file naming preferences}, {Use project wizards},
+    {Custom Wizards}
+*/
 
-    The names of the header and source file are based on the class name. To
+/*!
-    change the default suffix of a file, select \uicontrol Edit >
+    \page creator-how-to-set-cpp-file-naming.html
-    \uicontrol Preferences > \uicontrol {C++} > \uicontrol {File Naming}.
+    \previouspage creator-how-tos.html
 
-    \image qtcreator-options-cpp-files.png "C++ File Naming preferences"
+    \ingroup creator-how-to-projects
+
+    \title Set C++ file naming preferences
+
+    When you use the new file wizard to create a C++ header and source file for a
+    new class in a C++ project, the names of the header and source file are based
+    on the class name. To change the default suffix of a file for a project,
+    select \uicontrol Projects > \uicontrol {Project Settings} >
+    \uicontrol {C++ File Naming}.
+
+    \image qtcreator-projects-settings-cpp-file-naming.webp {C++ File Naming settings for a project}
 
     In the \uicontrol {License template} field, enter
     \l{Using Variables in Wizards}{predefined wizard variables} to specify the
     path and filename of the license to use in the source and header files.
 
-    \sa {Create files}, {Use project wizards}, {Custom Wizards}
+    To globally change the preferences, select \preferences > \uicontrol {C++} >
+    \uicontrol {File Naming}.
+
+    \sa {Create C++ classes}, {Use project wizards}
 */
 
 /*!

doc/qtcreator/src/projects/creator-only/creator-how-to-edit-qbs-profiles.qdoc

@@ -9,8 +9,8 @@
 
     \title Edit Qbs profiles
 
-    To view the Qbs profile associated with a kit, select \uicontrol Edit >
+    To view the Qbs profile associated with a kit, select \preferences >
-    \uicontrol Preferences > \uicontrol Qbs > \uicontrol Profiles.
+    \uicontrol Qbs > \uicontrol Profiles.
 
     \image creator-qbs-profiles.png "Qbs Profiles tab"
 
@@ -22,7 +22,7 @@
     To edit the Qbs profile associated with a kit:
 
     \list 1
-        \li In \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits, select
+        \li In \preferences > \uicontrol Kits, select
             the kit, and then select \uicontrol Change next to the
             \uicontrol {Additional Qbs Profile Settings} field to open the
             \uicontrol {Custom Properties} dialog.

doc/qtcreator/src/projects/creator-only/creator-how-to-select-build-systems.qdoc

@@ -50,8 +50,8 @@
     \section1 Set preferences for building and running
 
     To change the location of the project directory, and to specify settings
-    for building and running projects, select \uicontrol Edit >
+    for building and running projects, select \preferences >
-    \uicontrol Preferences > \uicontrol {Build & Run} > \uicontrol General.
+    \uicontrol {Build & Run} > \uicontrol General.
 
     Specify build and run settings for different target platforms, in the
     \uicontrol Projects mode.

doc/qtcreator/src/projects/creator-only/creator-projects-building.qdoc

@@ -98,10 +98,9 @@
     \section1 Building with CMake
 
     \QC automatically runs CMake when you make changes to \c {CMakeLists.txt}
-    files. To disable this feature, select \uicontrol Edit >
+    files. To disable this feature, select \preferences > \uicontrol CMake >
-    \uicontrol Preferences > \uicontrol CMake > \uicontrol General. Select the
+    \uicontrol General. Select the CMake executable to edit, and then deselect
-    CMake executable to edit, and then deselect the \uicontrol {Autorun CMake}
+    the \uicontrol {Autorun CMake} check box.
-    check box.
 
     \image qtcreator-preferences-cmake-tools.webp "Tools tab in CMake Preferences"
 
@@ -111,8 +110,8 @@
 
     To prevent failures on incremental builds, it might make sense
     to always run qmake before building, even though it means that
-    building will take more time. To enable this option, select \uicontrol Edit
+    building will take more time. To enable this option, select \preferences >
-    > \uicontrol Preferences > \uicontrol {Build & Run} > \uicontrol Qmake >
+    \uicontrol {Build & Run} > \uicontrol Qmake >
     \uicontrol {Run qmake on every build}.
 
     \image qtcreator-preferences-build-run-qmake.png "qmake tab in Build & Run Preferences"

doc/qtcreator/src/projects/creator-only/creator-projects-builds-customizing.qdoc

@@ -15,8 +15,7 @@
     \title  Customizing the Build Process
 
     To configure how projects are built, deployed, and run, select
-    \uicontrol Edit > \uicontrol Preferences > \uicontrol {Build & Run}
+    \preferences > \uicontrol {Build & Run} > \uicontrol General.
-     > \uicontrol General.
 
     \image qtcreator-project-options-deploy.png "Project General preferences"
 

doc/qtcreator/src/projects/creator-only/creator-projects-compilers.qdoc

@@ -23,8 +23,8 @@
     particular platform.
 
     \QC automatically detects the compilers that your system or \QOI
-    registers and lists them in \uicontrol Edit > \uicontrol Preferences >
+    registers and lists them in \preferences > \uicontrol Kits >
-    \uicontrol Kits > \uicontrol Compilers.
+    \uicontrol Compilers.
 
     \image qtcreator-toolchains.png
 
@@ -51,8 +51,7 @@
     To add a C or C++ compiler:
 
     \list 1
-        \li Select \uicontrol Edit > \uicontrol Preferences >
+        \li Select \preferences > \uicontrol Kits > \uicontrol Compilers.
-            \uicontrol Kits > \uicontrol Compilers.
         \li Select \uicontrol Add to add a new compiler or \uicontrol Clone to
             add another version of the selected compiler.
         \li Select a compiler in the list.
@@ -197,12 +196,11 @@
     these compilers, you also specify the path to the script that sets up the
     command prompt in the \uicontrol Initialization field.
 
-    You specify the compiler to use for each kit in \uicontrol Edit >
+    You specify the compiler to use for each kit in \preferences >
-    \uicontrol Preferences > \uicontrol Kits.
+    \uicontrol Kits.
 
     To set compiler preferences according to the compiler type, select
-    \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits >
+    \preferences > \uicontrol Kits > \uicontrol Compilers:
-    \uicontrol Compilers:
 
     \list
 
@@ -265,10 +263,9 @@
 
     \title Add Nim compilers
 
-    To build an application using the Nim Compiler, select \uicontrol Edit >
+    To build an application using the Nim Compiler, select \preferences >
-    \uicontrol Preferences > \uicontrol Kits > \uicontrol Compilers >
+    \uicontrol Kits > \uicontrol Compilers > \uicontrol Add > \uicontrol Nim,
-    \uicontrol Add > \uicontrol Nim, and specify the path to the directory where
+    and specify the path to the directory where the compiler is located.
-    the compiler is located.
 
     \sa {Add compilers}, {Compilers}
 */
@@ -281,8 +278,8 @@
 
     \title Add custom compilers
 
-    To add a compiler that is not listed \uicontrol Edit > \uicontrol Preferences
+    To add a compiler that is not listed \preferences >
-    > \uicontrol Kits > \uicontrol Compilers or to add a remote compiler, use the
+    \uicontrol Kits > \uicontrol Compilers or to add a remote compiler, use the
     \uicontrol Custom option. Specify the paths to the directories where the
     compiler and make tool are located and set preferences for the compiler.
 
@@ -292,7 +289,7 @@
 
     \list 1
 
-        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits >
+        \li Select \preferences > \uicontrol Kits >
             \uicontrol Compilers > \uicontrol Add > \uicontrol Custom >
             \uicontrol C or \uicontrol C++.
 

doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc

@@ -165,9 +165,9 @@
     not need to navigate to \uicontrol File > \uicontrol {New File} or
     \uicontrol {New Project}.
 
-    Set keyboard shortcuts for wizards in \uicontrol Edit >
+    Set keyboard shortcuts for wizards in \preferences > \uicontrol Environment >
-    \uicontrol Preferences > \uicontrol Environment > \uicontrol Keyboard >
+    \uicontrol Keyboard > \uicontrol Wizard. All wizard actions start with
-    \uicontrol Wizard. All wizard actions start with \uicontrol Impl there.
+    \uicontrol Impl there.
 
     \sa {Assign keyboard shortcuts}, {Activate kits for a project},
     {Create files}, {Creating Projects}

doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards.qdoc

@@ -85,9 +85,8 @@
 
     \QC has some actions that can improve the wizard development process. They
     don't have keyboard shortcuts by default, so you cannot trigger them. To
-    enable them, assign keyboard shortcuts in \uicontrol Edit >
+    enable them, assign keyboard shortcuts in \preferences >
-    \uicontrol Preferences > \uicontrol Environment > \uicontrol Keyboard >
+    \uicontrol Environment > \uicontrol Keyboard > \uicontrol Wizard.
-    \uicontrol Wizard.
 
     The following actions can help with wizard development:
 

doc/qtcreator/src/projects/creator-only/creator-projects-debuggers.qdoc

@@ -22,14 +22,13 @@
 
     The debugger plugin automatically selects a suitable native debugger for
     each \l{glossary-buildandrun-kit}{kit} from the ones found on your system.
-    To override this choice, select \uicontrol Edit > \uicontrol Preferences >
+    To override this choice, select \preferences > \uicontrol Kits.
-    \uicontrol Kits.
 
     To add debuggers:
 
     \list 1
 
-        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits >
+        \li Select \preferences > \uicontrol Kits >
             \uicontrol Debuggers > \uicontrol Add.
 
             \image qtcreator-preferences-kits-debuggers.webp {Debuggers tab in Kits preferences}

doc/qtcreator/src/projects/creator-only/creator-projects-kits.qdoc

@@ -43,7 +43,7 @@
 
     \list 1
 
-        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits.
+        \li Select \preferences > \uicontrol Kits.
         \li Select \uicontrol Add to start from an empty kit or \uicontrol Clone
             to clone the selected kit and edit its preferences.
             \image qtcreator-kits.png
@@ -78,7 +78,7 @@
 
     Typically, only a subset of the kit preferences is relevant for a particular
     setup. Therefore, \QC plugins register sets of relevant preferences that you
-    can view and modify in \uicontrol Edit > \uicontrol Preferences >
+    can view and modify in \preferences >
     \uicontrol Kits. For example, if you use CMake to build all your projects,
     you can hide Qbs and qmake preferences by default.
 

doc/qtcreator/src/projects/creator-only/creator-projects-nimble.qdoc

@@ -32,7 +32,7 @@
     To configure \QC to build Nim executables:
 
     \list 1
-        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits
+        \li Select \preferences > \uicontrol Kits >
             \uicontrol Compilers > \uicontrol Add > \uicontrol Nim to specify
             the path to the Nim compiler.
         \li Select \uicontrol Apply to add the compiler.

doc/qtcreator/src/projects/creator-only/creator-projects-opening.qdoc

@@ -71,13 +71,12 @@
     \endlist
 
     The \uicontrol {Configure Project} tab displays a list of kits that you
-    install on the development PC and configure in \uicontrol Edit >
+    install on the development PC and configure in \preferences > \uicontrol Kits.
-    \uicontrol Preferences > \uicontrol Kits.
 
     Even if you do not intend to build the project, the C++ and QML code models
     need a Qt version and compiler to offer code completion. To specify them,
-    select the \uicontrol Preferences link, or select \uicontrol Edit >
+    select the \uicontrol Preferences link, or select \preferences >
-    \uicontrol Preferences > \uicontrol Kits.
+    \uicontrol Kits.
 
     Qt for Python projects rely on the \l{Using Language Servers}
     {language server client} for code completion, highlighting, and

doc/qtcreator/src/projects/creator-only/creator-projects-qbs.qdoc

@@ -22,8 +22,8 @@
     with the build and run kit. \QC automatically creates a Qbs profile for each
     kit. You can edit the build profiles by adding new keys and values.
 
-    To check which Qbs version is being used, select \uicontrol Edit >
+    To check which Qbs version is being used, select \preferences >
-    \uicontrol Preferences > \uicontrol Qbs > \uicontrol General.
+    \uicontrol Qbs > \uicontrol General.
 
     \section1 Building Qbs
 
@@ -49,7 +49,7 @@
     To specify settings for Qbs:
 
     \list 1
-        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Qbs.
+        \li Select \preferences > \uicontrol Qbs.
             \image qtcreator-options-qbs.png "Qbs preferences"
         \li Deselect the \uicontrol {Use \QC settings directory for Qbs} check
             box to store Qbs profiles in the Qbs settings directory.
@@ -64,7 +64,7 @@
             \image creator-qbs-profiles.png "Qbs Profiles tab"
         \li In the \uicontrol Kit field, select a build and run kit to view
             the properties of the associated profile. To modify the properties,
-            select \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits.
+            select \preferences > \uicontrol Kits.
             For more information, see \l{Edit Qbs profiles}.
     \endlist
 

doc/qtcreator/src/projects/creator-only/creator-projects-qt-versions.qdoc

@@ -19,8 +19,8 @@
     build your projects. For example, \l{glossary-device}{device} manufacturers
     offer special Qt versions for developing applications for their devices.
 
-    To view the installed Qt versions, select \uicontrol Edit >
+    To view the installed Qt versions, select \preferences > \uicontrol Kits >
-    \uicontrol Preferences > \uicontrol Kits \uicontrol {Qt Versions}.
+    \uicontrol {Qt Versions}.
 
     \image qtcreator-qt-versions.png {Qt Versions tab in Kit preferences}
 
@@ -42,9 +42,7 @@
     To link to a Qt installation:
 
     \list 1
-        \li Select \uicontrol Edit > \uicontrol Preferences >
+        \li Select \preferences > \uicontrol Kits > \uicontrol {Qt Versions} >
-            (or \uicontrol {Qt Creator} > \uicontrol Preferences on
-            \macos) > \uicontrol Kits > \uicontrol {Qt Versions} >
             \uicontrol {Link with Qt}.
             \image qtcreator-link-with-qt.png {Choose Qt Installation dialog}
         \li In the \uicontrol {Qt installation path} field, enter the path to
@@ -61,8 +59,8 @@
     under \uicontrol Auto-detected, set it up manually.
 
     You specify the Qt version to use for each \l{glossary-buildandrun-kit}
-    {kit} for building and running your projects
+    {kit} for building and running your projects in \preferences >
-    in \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits.
+    \uicontrol Kits.
 
     \section1 Set up new Qt versions
 
@@ -70,7 +68,7 @@
 
         \list 1
 
-            \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits >
+            \li Select \preferences > \uicontrol Kits >
                 \uicontrol {Qt Versions} > \uicontrol Add.
 
             \li Select the qmake executable for the Qt version to add.

doc/qtcreator/src/projects/creator-only/creator-projects-settings-editor.qdoc

@@ -38,6 +38,6 @@
 
     \sa {Configuring Fonts}, {File Encoding},
     {Moving to Symbol Definition or Declaration}, {Indent text or code},
-    {Highlighting and Folding Blocks}, {Selecting Line Ending Style},
+    {Selecting Line Ending Style}, {Semantic Highlighting},
     {View function tooltips}
 */

doc/qtcreator/src/projects/creator-only/creator-projects-settings-environment.qdoc

@@ -19,7 +19,7 @@
     based on your project requirements.
 
     To globally change the system environment from the one in which
-    \QC is started, select \uicontrol Edit > \uicontrol Preferences >
+    \QC is started, select \preferences >
     \uicontrol Environment > \uicontrol System, and then select
     \uicontrol Change in the \uicontrol Environment field.
 

doc/qtcreator/src/projects/creator-only/creator-projects-settings-overview.qdoc

@@ -40,6 +40,7 @@
                 \li \l{Parsing C++ Files with the Clang Code Model}{Clangd}
                 \li \l{Using Clang Tools}{Clang Tools}
                 \li \l{Specify code style}{C++ Code Style}
+                \li \l{Set C++ file naming preferences}{C++ File Naming}
                 \li \l{Using Custom Output Parsers}{Custom Output Parsers}
                 \li \l{Specify dependencies}{Dependencies}
                 \li \l{Document code}{Documentation Comments}
@@ -70,7 +71,7 @@
 
     \image qtcreator-project-kits.png
 
-    The list displays kits from \uicontrol Edit > \uicontrol Preferences >
+    The list displays kits from \preferences >
     \uicontrol Kits. Warning and error icons indicate that the kit configuration
     is not suitable for the project type. To view the warning and error messages,
     move the mouse pointer over the kit name.

doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-analyze.qdocinc

@@ -47,8 +47,8 @@
 
     Click \uicontrol {Restore Global} to revert to the global settings.
 
-    To specify global Valgrind settings, select \uicontrol Edit >
+    To specify global Valgrind settings, select \preferences >
-    \uicontrol Preferences > \uicontrol Analyzer.
+    \uicontrol Analyzer.
 
 //! [settings valgrind]
 */

doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-desktop.qdocinc

@@ -20,10 +20,9 @@
     \image qtcreator-settings-run-desktop.webp {Run Settings}
 
     For console applications, check the \uicontrol{Run in terminal} check box.
-    To specify the terminal to use on Linux and \macos, select \uicontrol Edit
+    To specify the terminal to use on Linux and \macos, select \preferences >
-    > \uicontrol Preferences > \uicontrol Environment > \uicontrol System. To use
+    \uicontrol Environment > \uicontrol System. To use an \l{Terminal}
-    an \l{Terminal}{internal terminal}, select \uicontrol Edit >
+    {internal terminal}, select \preferences > \uicontrol Terminal >
-    \uicontrol Preferences > \uicontrol Terminal >
     \uicontrol {Use internal terminal}.
 
     To run with special environment variables set up, select them in the
@@ -40,8 +39,8 @@
 
     To disable library linking for the current project, deselect the
     \uicontrol {Add build library search path to PATH} check box. To disable
-    library linking for all projects, select \uicontrol Edit >
+    library linking for all projects, select \preferences >
-    \uicontrol Preferences > \uicontrol {Build & Run}, and then deselect the
+    \uicontrol {Build & Run}, and then deselect the
     \uicontrol {Add linker library search paths to run environment} check box.
 
     The \uicontrol {Use debug version of frameworks (DYLD_IMAGE_SUFFIX=_debug)} option

doc/qtcreator/src/projects/creator-only/creator-projects-settings-run.qdoc

@@ -24,7 +24,7 @@
     \image qtcreator-settings-run.webp {Run Settings}
 
     To prevent \QC from automatically creating run configurations, select
-    \uicontrol Edit > \uicontrol Preferences > \uicontrol {Build & Run},
+    \preferences > \uicontrol {Build & Run},
     and then deselect the \uicontrol {Create suitable run configurations
     automatically} check box.