Merge remote-tracking branch 'origin/8.0'

Change-Id: Icef5e28557701243e686d35cf885412eb341e75a

dist/clangformat/README.md

@@ -35,13 +35,13 @@ For more information about clang-format, see
   1. Enable the Beautifier plugin and restart to load it.
 
   2. Configure the plugin:
-     In Menu: Tools > Options > Beautifier > Tab: Clang Format
+     In Menu: Edit > Preferences > Beautifier > Tab: Clang Format
       * Select a valid clang-format executable
       * Use predefined style: File
           * Fallback style: None
 
   3. Set shortcuts for convenience:
-     In Menu: Tools > Options > Environment > Keyboard
+     In Menu: Edit > Preferences > Environment > Keyboard
       * ClangFormat / FormatFile - e.g. Alt+C, F
       * ClangFormat / FormatAtCursor - e.g. Alt+C, C
       * ClangFormat / DisableFormattingSelectedText - e.g. Alt+C, D

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

@@ -126,7 +126,7 @@
     \section1 Specifying Performance Analyzer Settings
 
     To specify global settings for the Performance Analyzer, select
-    \uicontrol Tools > \uicontrol Options > \uicontrol Analyzer >
+    \uicontrol Edit > \uicontrol 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-clang-static-analyzer.qdoc

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

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

@@ -94,6 +94,6 @@
     marks or annotations.
 
     To specify the settings above for the automatically run checks,
-    select \uicontrol Tools > \uicontrol Options > \uicontrol Analyzer
+    select \uicontrol Edit > \uicontrol Preferences > \uicontrol Analyzer
     > \uicontrol Cppcheck.
 */

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

@@ -114,7 +114,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 Tools > \uicontrol Options >
+    post-mortem debugger by selecting \uicontrol Edit > \uicontrol Preferences >
     \uicontrol Debugger > \uicontrol General >
     \uicontrol {Use Qt Creator for post-mortem debugging}.
 

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

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

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

@@ -103,8 +103,8 @@
     separately for each project in the \l{Specifying Run Settings}{run settings}
     of the project.
 
-    To specify global settings for Valgrind, select \uicontrol Tools >
+    To specify global settings for Valgrind, select \uicontrol Edit >
-    \uicontrol Options > \uicontrol Analyzer. The \uicontrol
+    \uicontrol Preferences > \uicontrol Analyzer. The \uicontrol
     {Memcheck Memory Analysis Options} group contains Memcheck options.
 
     In \uicontrol {Extra Memcheck arguments}, specify additional arguments
@@ -112,7 +112,7 @@
 
     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 Tools > \uicontrol Options > \uicontrol Analyzer
+    too big, select \uicontrol Edit > \uicontrol Preferences > \uicontrol Analyzer
     and define the length of the stack trace in the
     \uicontrol {Backtrace frame count} field.
 
@@ -290,8 +290,8 @@
     separately for each project in the \l{Specifying Run Settings}{run settings}
     of the project.
 
-    To specify global settings for Valgrind, select \uicontrol Tools >
+    To specify global settings for Valgrind, select \uicontrol Edit >
-    \uicontrol Options > \uicontrol Analyzer. The \uicontrol
+    \uicontrol Preferences > \uicontrol Analyzer. The \uicontrol
     {Callgrind Profiling Options} group contains Callgrind options.
 
     \image qtcreator-valgrind-callgrind-options.png "Valgrind options"

doc/qtcreator/src/android/androiddev.qdoc

@@ -80,7 +80,7 @@
     To set up the development environment for Android:
 
     \list 1
-        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Devices >
+        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Devices >
             \uicontrol Android on Windows and Linux or \uicontrol {\QC} >
             \uicontrol Preferences > \uicontrol Devices > \uicontrol Android on
             \macos.
@@ -171,8 +171,8 @@
 
     \section2 Managing Android NDK Packages
 
-    To view the installed \l{Android NDK} versions, select \uicontrol Tools >
+    To view the installed \l{Android NDK} versions, select \uicontrol Edit >
-    \uicontrol Options > \uicontrol Devices > \uicontrol Android on Windows and
+    \uicontrol Preferences > \uicontrol Devices > \uicontrol Android on Windows and
     Linux or \uicontrol {\QC} > \uicontrol Preferences > \uicontrol Devices >
     \uicontrol Android on \macos.
 
@@ -201,8 +201,8 @@
     installing, updating, and removing SDK packages. You can still use
     sdkmanager for advanced SDK management.
 
-    To view the installed Android SDK packages, select \uicontrol Tools >
+    To view the installed Android SDK packages, select \uicontrol Edit >
-    \uicontrol Options > \uicontrol Devices > \uicontrol Android >
+    \uicontrol Preferences > \uicontrol Devices > \uicontrol Android >
     \uicontrol {SDK Manager} on Windows and Linux or \uicontrol {\QC} >
     \uicontrol Preferences > \uicontrol Devices > \uicontrol Android >
     \uicontrol {SDK Manager} on \macos.
@@ -229,7 +229,7 @@
 
     \section1 Managing Android Virtual Devices (AVD)
 
-    The available AVDs are listed in \uicontrol Tools > \uicontrol Options
+    The available AVDs are listed in \uicontrol Edit > \uicontrol Preferences
     > \uicontrol Devices on Windows and Linux or \uicontrol {\QC} >
     \uicontrol Preferences > \uicontrol Devices > on \macos. You can add more
     AVDs.
@@ -268,7 +268,7 @@
     To create new virtual devices:
 
     \list 1
-        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Devices >
+        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Devices >
             \uicontrol Add > \uicontrol {Android Device} on Windows and Linux
             or \uicontrol {\QC} > \uicontrol Preferences > \uicontrol Devices >
             \uicontrol Add > \uicontrol {Android Device} on \macos to open the

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

@@ -92,7 +92,7 @@
     \section1 Specifying Settings for Debug Server Providers
 
     To create connections to bare metal devices using a debug server provider,
-    select \uicontrol Tools > \uicontrol Options > \uicontrol Devices
+    select \uicontrol Edit > \uicontrol Preferences > \uicontrol Devices
     > \uicontrol {Bare Metal} > \uicontrol Add > \uicontrol Default.
     The available settings depend on the debug server provider.
 
@@ -274,7 +274,7 @@
 
         \list 1
 
-           \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Devices
+           \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Devices
                 > \uicontrol Add > \uicontrol {Bare Metal Device} >
                 \uicontrol {Start Wizard}.
 
@@ -288,7 +288,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 Tools > \uicontrol Options > \uicontrol Kits
+    devices, select \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits
     > \uicontrol Add. For more information, see \l{Adding Kits}.
 
     \image qtcreator-baremetal-kit.png "Kit options for Bare Metal"

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

@@ -147,8 +147,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 Tools >
+    To be asked before \QC resets the changes, select \uicontrol Edit >
-    \uicontrol Options > \uicontrol {Build & Run} > \uicontrol CMake >
+    \uicontrol Preferences > \uicontrol {Build & Run} > \uicontrol CMake >
     \uicontrol {Ask before re-configuring with initial parameters}.
 
     \image qtcreator-build-run-options-cmake.png "CMake Build & Run options"
@@ -224,7 +224,7 @@
     \QC can automatically set up the \l {Setting Up Conan}
     {Conan package manager} for use with CMake.
 
-    Select \uicontrol Tools > \uicontrol Options > \uicontrol {Build & Run} >
+    Select \uicontrol Edit > \uicontrol Preferences > \uicontrol {Build & Run} >
     \uicontrol CMake > \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.qdoc

@@ -96,7 +96,7 @@
 
     \list 1
 
-        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Kits >
+        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits >
             \uicontrol CMake.
 
             \image qtcreator-cmakeexecutable.png

doc/qtcreator/src/debugger/creator-debugger-common.qdocinc

@@ -148,8 +148,8 @@
     \if defined(qtcreator)
     \section2 Specifying Breakpoint Settings
 
-    You can specify settings for breakpoints in \uicontrol Tools >
+    You can specify settings for breakpoints in \uicontrol Edit >
-    \uicontrol Options > \uicontrol Debugger. For more information,
+    \uicontrol Preferences > \uicontrol Debugger. For more information,
     see \l{Specifying Debugger Settings}.
 
     To use a full absolute path in breakpoints, select the

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

@@ -29,8 +29,8 @@
 
     \section1 Specifying Debugger Settings
 
-    To specify settings for managing debugger processes, select \uicontrol Tools
+    To specify settings for managing debugger processes, select \uicontrol Edit
-     > \uicontrol Options > \uicontrol Debugger. In the \uicontrol General tab,
+     > \uicontrol Preferences > \uicontrol Debugger. In the \uicontrol General tab,
      you can specify settings that are common to all debuggers.
 
     \image qtcreator-debugger-general-options.png
@@ -71,8 +71,8 @@
 
     \section2 Specifying GDB Settings
 
-    To specify settings for managing the GDB process, select \uicontrol Tools >
+    To specify settings for managing the GDB process, select \uicontrol Edit >
-    \uicontrol Options > \uicontrol Debugger > \uicontrol GDB.
+    \uicontrol Preferences > \uicontrol Debugger > \uicontrol GDB.
 
     \image qtcreator-gdb-options.png "GDB options"
 
@@ -134,8 +134,8 @@
 
     \section2 Specifying Extended GDB Settings
 
-    To specify extended settings for GBD, select \uicontrol Tools >
+    To specify extended settings for GBD, select \uicontrol Edit >
-    \uicontrol Options > \uicontrol Debugger > \uicontrol {GDB Extended}.
+    \uicontrol Preferences > \uicontrol Debugger > \uicontrol {GDB Extended}.
     The settings give access to advanced or experimental functions of GDB.
     Enabling them may negatively impact your debugging experience, so use
     them with care.
@@ -162,8 +162,8 @@
 
     \section2 Specifying CDB Settings
 
-    To specify settings for managing the CDB process, select \uicontrol Tools >
+    To specify settings for managing the CDB process, select \uicontrol Edit >
-    \uicontrol Options > \uicontrol Debugger > \uicontrol CDB.
+    \uicontrol Preferences > \uicontrol Debugger > \uicontrol CDB.
 
     \image qtcreator-cdb-options.png "CDB options"
 
@@ -214,7 +214,7 @@
     to the symbol search path of the debugger:
 
     \list 1
-        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Debugger >
+        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Debugger >
             \uicontrol {CDB Paths}.
             \image qtcreator-debugger-cdb-paths.png
         \li In the \uicontrol {Symbol Paths} group, select \uicontrol Insert.

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

@@ -40,7 +40,7 @@
     The main debugger settings are associated with the
     \l{glossary-buildandrun-kit}{kit} you build and run your project with. To
     specify the debugger and compiler to use for each kit, select
-    \uicontrol Tools > \uicontrol Options > \uicontrol Kits.
+    \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits.
 
     You need to set up the debugger only if the automatic setup fails, because
     the native debugger is missing (as is usually the case for the CDB debugger
@@ -55,7 +55,7 @@
     kit for your project.
 
     If the debugger you want to use is not automatically detected, select
-    \uicontrol Tools > \uicontrol Options > \uicontrol Kits >
+    \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits >
     \uicontrol Debuggers > \uicontrol Add to add it.
 
     \note To use the debugging tools for Windows, you must install them and add

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

@@ -120,7 +120,7 @@
 
     When using GDB or CDB as debug backend, you can specify additional commands
     to execute before and after the backend and debugged program are started or
-    attached in \uicontrol Tools > \uicontrol Options > \uicontrol Debugger >
+    attached in \uicontrol Edit > \uicontrol Preferences > \uicontrol Debugger >
     \uicontrol GDB and \uicontrol CDB. For more information, see
     \l{Specifying Debugger Settings}.
 
@@ -182,7 +182,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 Tools > \uicontrol Options >
+    using CDB's native console. Select \uicontrol Edit > \uicontrol 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.
@@ -336,7 +336,7 @@
 
     The \QC installation program asks you whether you want to register \QC as a
     post-mortem debugger. To change the setting, select
-    \uicontrol Tools > \uicontrol Options > \uicontrol Debugger >
+    \uicontrol Edit > \uicontrol 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
@@ -424,7 +424,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 Tools > \uicontrol Options > \uicontrol Debugger >
+    \uicontrol Edit > \uicontrol Preferences > \uicontrol Debugger >
     \uicontrol GDB. For more information about settings that you can specify
     to manage the GDB process, see \l{Specifying GDB Settings} and
     \l{Specifying Extended GDB Settings}.
@@ -494,8 +494,8 @@
 
     \endlist
 
-    To specify settings for managing the CDB process, select \uicontrol Tools >
+    To specify settings for managing the CDB process, select \uicontrol Edit >
-    \uicontrol Options > \uicontrol Debugger > \uicontrol CDB. For more
+    \uicontrol Preferences > \uicontrol Debugger > \uicontrol CDB. For more
     information, see \l{Specifying CDB Settings}.
 */
 
@@ -643,7 +643,7 @@
    \section2 Customizing Debug Views
 
     You can change the appearance and behavior of the debug views by specifying
-    settings in \uicontrol Options > \uicontrol Debugger. For example, you can:
+    settings in \uicontrol Preferences > \uicontrol Debugger. For example, you can:
 
     \list
         \li Use alternating row colors in debug views.
@@ -754,7 +754,7 @@
 
     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 Tools > \uicontrol Options >
+    for the specified modules, select \uicontrol Edit > \uicontrol Preferences >
     \uicontrol Debugger > \uicontrol CDB. For more information, see
     \l{Specifying CDB Settings}.
 
@@ -791,7 +791,7 @@
     (\uicontrol {Operate by Instruction}) tool button on the debugger tool bar.
 
     By default, GDB shows AT&T style disassembly. To switch to the Intel style,
-    select \uicontrol Tools > \uicontrol Options > \uicontrol Debugger >
+    select \uicontrol Edit > \uicontrol Preferences > \uicontrol Debugger >
     \uicontrol GDB > \uicontrol {Use Intel style disassembly}.
 
     \section2 Viewing and Editing Register State
@@ -861,7 +861,7 @@
     To give the user simple access also to these items, \QC employs Python
     scripts that are called \e {debugging helpers}.
     Debugging helpers are always automatically used. To force a plain C-like
-    display of structures, select \uicontrol Tools > \uicontrol Options >
+    display of structures, select \uicontrol Edit > \uicontrol Preferences >
     \uicontrol Debugger > \uicontrol {Locals & Expressions}, and then deselect
     the \uicontrol {Use Debugging Helper} check box. This will still use the
     Python scripts, but generate more basic output. To force the plain display
@@ -888,7 +888,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 Options >
+    to the libraries your application uses, select \uicontrol Preferences >
     \uicontrol Debugger > \uicontrol GDB > \uicontrol {Load system GDB pretty
     printers}. For more information, see \l{Specifying GDB Settings}.
 
@@ -896,7 +896,7 @@
 
     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 Tools > \uicontrol Options >
+    modify existing ones, select \uicontrol Edit > \uicontrol Preferences >
     \uicontrol Debugger > \uicontrol {Locals & Expressions}, and enter the
     commands in the \uicontrol {Debugging Helper Customization} field.
 
@@ -918,7 +918,7 @@
     \endcode
 
     To display a message box as soon as your application receives a signal
-    during debugging, select \uicontrol Tools > \uicontrol Options >
+    during debugging, select \uicontrol Edit > \uicontrol Preferences >
     \uicontrol Debugger > \uicontrol GDB > \uicontrol {Show a message box
     when receiving a signal}.
 
@@ -931,8 +931,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 Tools >
+    \uicontrol {Additional Startup Commands} in \uicontrol Edit >
-    \uicontrol Options > \uicontrol Debugger > \uicontrol GDB.
+    \uicontrol Preferences > \uicontrol Debugger > \uicontrol GDB.
 
     To get started with implementing debugging helpers for your own data types,
     you can put their implementation into the file
@@ -965,7 +965,7 @@
             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 Tools > \uicontrol Options > \uicontrol Debugger >
+            \uicontrol Edit > \uicontrol Preferences > \uicontrol Debugger >
             \uicontrol {Locals & Expressions} >
             \uicontrol {Extra Debugging Helpers}.
     \endlist
@@ -1108,7 +1108,7 @@
     common situations.
 
     When using CDB as debugger backend, you can enable the Python dumper by
-    selecting \uicontrol Tools > \uicontrol Options > \uicontrol Debugger >
+    selecting \uicontrol Edit > \uicontrol Preferences > \uicontrol Debugger >
     \uicontrol CDB > \uicontrol {Use Python dumper}.
 
     \section3 Dumper Class
@@ -1544,8 +1544,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 Tools
+    when loading the same binary in the future. Select \uicontrol Edit
-    > \uicontrol Options > \uicontrol Debugger > \uicontrol GDB >
+    > \uicontrol Preferences > \uicontrol Debugger > \uicontrol GDB >
     \uicontrol {Use automatic symbol cache}.
 
     Some slowness stems from maintaining breakpoints inside

doc/qtcreator/src/editors/creator-clangformat.qdocinc

@@ -48,7 +48,7 @@
     up to the file system root.
 
     To override the \c {.clang-format} file globally for all projects, select
-    \uicontrol Tools > \uicontrol Options > \uicontrol {C++} > \uicontrol Copy >
+    \uicontrol Edit > \uicontrol Preferences > \uicontrol {C++} > \uicontrol Copy >
     \uicontrol Edit > \uicontrol {ClangFormat} >
     \uicontrol {Override Clang Format configuration file}.
 

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

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

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

@@ -76,7 +76,7 @@
     In addition, you can import and export code style settings.
 
     To automatically fix indentation according to the indentation settings
-    when you save the file, select \uicontrol Tools > \uicontrol Options >
+    when you save the file, select \uicontrol Edit > \uicontrol Preferences >
     \uicontrol {Text Editor} > \uicontrol Behavior >
     \uicontrol {Clean whitespace} > \uicontrol {Clean indentation}. Select
     the \uicontrol {Skip clean whitespace for file types} check box to
@@ -84,8 +84,8 @@
 
     \image qtcreator-options-text-editor-behavior.png "Text Editor Behavior options"
 
-    To visualize whitespace in the editor, select \uicontrol Tools >
+    To visualize whitespace in the editor, select \uicontrol Edit >
-    \uicontrol Options > \uicontrol {Text Editor} > \uicontrol Display >
+    \uicontrol Preferences > \uicontrol {Text Editor} > \uicontrol Display >
     \uicontrol {Visualize whitespace}.
 
     \image qtcreator-options-text-editor-display.png "Text Editor Display options"
@@ -103,7 +103,7 @@
     To specify indentation settings for the C++ editor:
 
     \list 1
-        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol {C++}.
+        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol {C++}.
         \li In the \uicontrol {Current settings} field, select the settings to
             modify and click \uicontrol Copy.
             \image qtcreator-options-code-style-cpp.png "C++ Code Style options"
@@ -139,7 +139,7 @@
     To specify settings for the Qt Quick editor:
 
     \list 1
-        \li Select \uicontrol Tools > \uicontrol Options >
+        \li Select \uicontrol Edit > \uicontrol Preferences >
             \uicontrol {Qt Quick}.
         \li In the \uicontrol {Current settings} field, select the settings to
             modify and click \uicontrol Copy.
@@ -161,7 +161,7 @@
     To specify settings for the Nim editor (experimental):
 
     \list 1
-        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Nim.
+        \li Select \uicontrol Edit > \uicontrol 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 options"
@@ -180,8 +180,8 @@
     \section1 Indenting Other Text Files
 
     To specify indentation settings for text files that do not contain C++ or
-    QML code (such as Python code files), select \uicontrol Tools >
+    QML code (such as Python code files), select \uicontrol Edit >
-    \uicontrol Options > \uicontrol {Text Editor} > \uicontrol Behavior.
+    \uicontrol Preferences > \uicontrol {Text Editor} > \uicontrol Behavior.
 
     \image qtcreator-indentation.png "Text Editor Behavior options"
 
@@ -230,7 +230,7 @@
 
     When you type text or code, it is indented automatically according to the
     selected text editor or code style options. To specify typing options,
-    select \uicontrol Tools > \uicontrol Options > \uicontrol {Text Editor} >
+    select \uicontrol Edit > \uicontrol Preferences > \uicontrol {Text Editor} >
     \uicontrol Behavior > \uicontrol Typing.
 
     To disable automatic indentation, deselect the

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

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

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

@@ -48,7 +48,7 @@
     \image qtcreator-semanticerror.png
 
     To modify the colors used for underlining errors and warnings, select
-    \uicontrol Tools > \uicontrol Options > \uicontrol {Text Editor} >
+    \uicontrol Edit > \uicontrol Preferences > \uicontrol {Text Editor} >
     \uicontrol {Font & Colors} > \uicontrol Copy, and select new colors for
     \uicontrol Error and \uicontrol Warning.
 
@@ -90,7 +90,7 @@
     \section2 Specifying Line Annotation Positions
 
     To specify the position where the annotations are displayed, select
-    \uicontrol Tools > \uicontrol Options > \uicontrol {Text Editor} >
+    \uicontrol Edit > \uicontrol 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
@@ -747,7 +747,7 @@
 
     \section1 Automatically Formatting QML/JS Files
 
-    To automatically format QML/JS files upon saving, select \uicontrol Tools >
+    To automatically format QML/JS files upon saving, select \uicontrol Edit >
-    \uicontrol Options > \uicontrol {Qt Quick} > \uicontrol {QML/JS Editing} >
+    \uicontrol Preferences > \uicontrol {Qt Quick} > \uicontrol {QML/JS Editing} >
     \uicontrol {Enable auto format on file save}.
 */

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

@@ -109,7 +109,7 @@
     \section2 Changing Text Encoding
 
     To show the file encoding of the current file on the editor toolbar (5),
-    select \uicontrol Tools > \uicontrol Options > \uicontrol {Text Editor} >
+    select \uicontrol Edit > \uicontrol Preferences > \uicontrol {Text Editor} >
     \uicontrol Display > \uicontrol {Display file encoding}.
 
     To change the text encoding, click it on the toolbar and select new
@@ -128,7 +128,7 @@
     select the ending style on the editor toolbar (6).
 
     To set the line endings to use for all projects by default, select
-    \uicontrol Tools > \uicontrol Options > \uicontrol {Text Editor} >
+    \uicontrol Edit > \uicontrol Preferences > \uicontrol {Text Editor} >
     \uicontrol Behavior, and then select the ending style in the
     \uicontrol {Default line endings} field.
 
@@ -285,8 +285,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 Tools >
+    To enable this moving function, select \uicontrol Edit >
-    \uicontrol Options > \uicontrol {Text Editor} > \uicontrol Behavior >
+    \uicontrol Preferences > \uicontrol {Text Editor} > \uicontrol Behavior >
     \uicontrol {Enable mouse navigation}.
 
     There are several additional ways of moving between symbol definitions and
@@ -313,7 +313,7 @@
     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 Tools > \uicontrol Options > \uicontrol {Text Editor} >
+    \uicontrol Edit > \uicontrol Preferences > \uicontrol {Text Editor} >
     \uicontrol Display > \uicontrol {Always open links in another split}.
     Additional symbols are
     displayed and switching between definition and declaration is done in

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

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

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

@@ -41,7 +41,7 @@
     \title Specifying Text Editor Settings
 
     Set the font preferences and apply color schemes for syntax highlighting in
-    \uicontrol Tools > \uicontrol Options > \uicontrol {Text Editor} >
+    \uicontrol Edit > \uicontrol Preferences > \uicontrol {Text Editor} >
     \uicontrol {Font & Colors}.
 
     \image qtcreator-font-colors.png "Text editor options"
@@ -52,7 +52,7 @@
     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 Tools > \uicontrol Options > \uicontrol {Text Editor} >
+    \uicontrol Edit > \uicontrol Preferences > \uicontrol {Text Editor} >
     \uicontrol Behavior and deselect the
     \uicontrol {Enable scroll wheel zooming} check box.
 
@@ -70,7 +70,7 @@
 
     \list 1
 
-        \li Select \uicontrol Tools > \uicontrol Options >
+        \li Select \uicontrol Edit > \uicontrol Preferences >
             \uicontrol {Text Editor} > \uicontrol {Fonts & Color} >
             \uicontrol Copy.
 
@@ -101,7 +101,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 Tools > \uicontrol Options >
+    To export a color scheme, select \uicontrol Edit > \uicontrol Preferences >
     \uicontrol {Text Editor} > \uicontrol {Fonts & Color} > \uicontrol Export,
     and then select the filename and location for the XML file.
 
@@ -116,8 +116,8 @@
 
     \section2 File Encoding
 
-    To define the default file encoding, select \uicontrol Tools >
+    To define the default file encoding, select \uicontrol Edit >
-    \uicontrol Options > \uicontrol {Text Editor} > \uicontrol Behavior, and
+    \uicontrol Preferences > \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 options"

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

@@ -41,7 +41,7 @@
     \title Configuring the Editor
 
     You can configure the text editor to suit your specific needs by selecting
-    \uicontrol Tools > \uicontrol Options > \uicontrol{Text Editor}.
+    \uicontrol Edit > \uicontrol Preferences > \uicontrol{Text Editor}.
 
     \image qtcreator-font-colors.png "Text Editor options"
 

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

@@ -276,7 +276,7 @@
 
     \list 1
 
-        \li Select \uicontrol Tools > \uicontrol Options >
+        \li Select \uicontrol Edit > \uicontrol Preferences >
             \uicontrol Environment > \uicontrol Locator >
             \uicontrol {Web Search (prefix: r)} > \uicontrol Edit.
 
@@ -352,7 +352,7 @@
 
     \list 1
 
-        \li Select \uicontrol Tools > \uicontrol Options >
+        \li Select \uicontrol Edit > \uicontrol Preferences >
             \uicontrol Environment > \uicontrol Locator.
 
         \li In \uicontrol {Refresh interval}, define new time in minutes.

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

@@ -75,7 +75,7 @@
 
         \li Select \uicontrol {Restart Now} to restart \QC and load the plugin.
 
-        \li Select \uicontrol Tools > \uicontrol Options >
+        \li Select \uicontrol Edit > \uicontrol Preferences >
             \uicontrol Beautifier to specify settings for beautifying files.
 
         \li Select the \uicontrol {Enable auto format on file save} check box to
@@ -164,7 +164,7 @@
 
             \endlist
 
-        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Beautifier
+        \li Select \uicontrol Edit > \uicontrol 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

@@ -106,7 +106,7 @@
 
     \endlist
 
-    To use the built-in code model instead, select \uicontrol Tools > \uicontrol Options >
+    To use the built-in code model instead, select \uicontrol Edit > \uicontrol 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 for certain projects, or vice versa.
@@ -124,7 +124,7 @@
 
     \list 1
 
-        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol C++ >
+        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol C++ >
             \uicontrol {Code Model}.
 
             \image qtcreator-clang-code-model-options.png
@@ -161,7 +161,7 @@
     To specify settings for clangd:
 
     \list 1
-        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol C++ >
+        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol C++ >
             \uicontrol Clangd > \uicontrol {Use clangd}.
             \image qtcreator-options-clangd.png "clangd options"
         \li In \uicontrol {Path to executable}, enter the path to clangd

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

@@ -45,7 +45,7 @@
     To specify settings for the code pasting service:
 
     \list 1
-        \li Select \uicontrol Tools > \uicontrol Options  >
+        \li Select \uicontrol Edit > \uicontrol Preferences  >
             \uicontrol {Code Pasting}.
             \image qtcreator-code-pasting-options.png "Code Pasting options"
         \li In the \uicontrol {Default protocol} field, select a code pasting

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

@@ -115,7 +115,7 @@
     \section2 Plugin Emulation
 
     FakeVim also emulates some popular vim plugins. To enable plugin emulation
-    for particular plugins, select \uicontrol Tools > \uicontrol Options >
+    for particular plugins, select \uicontrol Edit > \uicontrol Preferences >
     \uicontrol FakeVim > \uicontrol General > \uicontrol {Plugin Emulation}.
 
     \image qtcreator-fakevim-options-general-plugin-emulation.png "FakeVim Plugin Emulation options"
@@ -291,7 +291,7 @@
     \section1 Mapping FakeVim Commands
 
     To map commands entered on the \uicontrol FakeVim command line to
-    \QC functions, select \uicontrol Tools > \uicontrol Options >
+    \QC functions, select \uicontrol Edit > \uicontrol Preferences >
     \uicontrol FakeVim > \uicontrol {Ex Command Mapping}.
     Enter a string in the \uicontrol Filter field to search for a specific
     \QC function.
@@ -306,8 +306,8 @@
     To reset the trigger expressions for all functions, select
     \uicontrol {Reset All}.
 
-    To map \e {user commands} to keyboard shortcuts, select \uicontrol Tools >
+    To map \e {user commands} to keyboard shortcuts, select \uicontrol Edit >
-    \uicontrol Options > \uicontrol FakeVim >
+    \uicontrol Preferences > \uicontrol FakeVim >
     \uicontrol {User Command Mapping}. The user command mapped to the shortcut
     is executed by FakeVim as if you were typing it (as when replaying a macro).
 
@@ -315,8 +315,8 @@
 
     \section1 Specifying FakeVim Options
 
-    To make changes to the Vim-style settings, select \uicontrol Tools >
+    To make changes to the Vim-style settings, select \uicontrol Edit >
-    \uicontrol Options > \uicontrol FakeVim > \uicontrol General.
+    \uicontrol Preferences > \uicontrol FakeVim > \uicontrol General.
 
     \image qtcreator-fakevim-options.png "FakeVim options"
 
@@ -326,13 +326,13 @@
     select \uicontrol {Set Plain Style}. You can then change any of the
     preselected settings.
 
-    To use a Vim-style color scheme, select \uicontrol Tools >
+    To use a Vim-style color scheme, select \uicontrol Edit >
-    \uicontrol Options > \uicontrol {Text Editor} > \uicontrol {Fonts & Color}.
+    \uicontrol Preferences > \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, unselect \uicontrol Tools > \uicontrol Options >
+    To quit the FakeVim mode, unselect \uicontrol Edit > \uicontrol 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

@@ -40,7 +40,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 Tools > \uicontrol Options > \uicontrol {Text Editor}
+            \uicontrol Edit > \uicontrol Preferences > \uicontrol {Text Editor}
             > \uicontrol Behavior
         \li Highlighting the symbol under cursor
         \li \l{Viewing Function Tooltips}{Viewing function tooltips}
@@ -85,8 +85,8 @@
 
     \section2 Adding Language Servers
 
-    To view a list of language servers, select \uicontrol Tools >
+    To view a list of language servers, select \uicontrol Edit >
-    \uicontrol Options > \uicontrol {Language Client} (or
+    \uicontrol Preferences > \uicontrol {Language Client} (or
     \uicontrol {Qt Creator} > \uicontrol Preferences >
     \uicontrol {Language Client} > on \macos).
 
@@ -102,7 +102,7 @@
     To add a generic language server:
 
     \list 1
-        \li Select \uicontrol Tools > \uicontrol Options >
+        \li Select \uicontrol Edit > \uicontrol Preferences >
             \uicontrol {Language Client} > \uicontrol Add >
             \uicontrol {New Generic StdIO Language Server}
             to add a generic language server.
@@ -133,7 +133,7 @@
     To add a Java language server:
 
     \list 1
-        \li Select \uicontrol Tools > \uicontrol Options >
+        \li Select \uicontrol Edit > \uicontrol Preferences >
             \uicontrol {Language Client} > \uicontrol Add >
             \uicontrol {New Java Language Server} to add a Java language server.
             \image qtcreator-language-client-options-java.png "Java language server options"

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

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

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

@@ -46,13 +46,13 @@
     \uicontrol {Text Editing Macros} > \uicontrol {Save Last Macro}.
 
     To assign a keyboard shortcut to a text editing macro, select
-    \uicontrol Tools > \uicontrol Options > \uicontrol Environment >
+    \uicontrol Edit > \uicontrol Preferences > \uicontrol Environment >
     \uicontrol Keyboard. For more information, see
     \l{Configuring 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 Tools >
+    To view and remove saved macros, select \uicontrol Edit >
-    \uicontrol Options > \uicontrol {Text Editor} > \uicontrol Macros.
+    \uicontrol Preferences > \uicontrol {Text Editor} > \uicontrol Macros.
 */

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

@@ -104,7 +104,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 Tools > \uicontrol Options > \uicontrol C++ >
+    select \uicontrol Edit > \uicontrol Preferences > \uicontrol C++ >
     \uicontrol {Quick Fixes}.
 
     To specify custom settings for a particular project, select

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

@@ -117,7 +117,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 Tools > \uicontrol Options > \uicontrol {Text Editor} >
+    \uicontrol Edit > \uicontrol Preferences > \uicontrol {Text Editor} >
     \uicontrol Display > \uicontrol {Highlight search results on the scrollbar}.
 
     To search using more advanced options, select \uicontrol Advanced.
@@ -266,7 +266,7 @@
 
         \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 Tools > \uicontrol Options > \uicontrol Environment >
+            Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Environment >
             \uicontrol System (or \uicontrol {\QC} > \uicontrol Preferences >
             \uicontrol Environment > \uicontrol System on macOS), then select
             \uicontrol Change in the \uicontrol Environment field and add an entry

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

@@ -42,7 +42,7 @@
     \endlist
 
     To specify the color scheme to use for semantic highlighting, select
-    \uicontrol Tools > \uicontrol Options > \uicontrol {Text Editor} >
+    \uicontrol Edit > \uicontrol Preferences > \uicontrol {Text Editor} >
     \uicontrol {Fonts & Color}.
 
     \QC supports syntax highlighting also for other types of files than C++,
@@ -66,7 +66,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 Tools > \uicontrol Options >
+    remembered definitions, select \uicontrol Edit > \uicontrol Preferences >
     \uicontrol {Text Editor} > \uicontrol {Generic Highlighter} >
     \uicontrol {Reset Remembered Definitions}.
 
@@ -77,7 +77,7 @@
     {General Messages}.
 
     To suppress the message for a particular file pattern, select
-    \uicontrol Tools > \uicontrol Options > \uicontrol {Text Editor}
+    \uicontrol Edit > \uicontrol Preferences > \uicontrol {Text Editor}
     > \uicontrol {Generic Highlighter} and add the pattern to the
     \uicontrol {Ignored file patterns} field.
 
@@ -97,15 +97,15 @@
 
     \image qtcreator-blockhighlighting.png
 
-    To enable block highlighting, select \uicontrol Tools >
+    To enable block highlighting, select \uicontrol Edit >
-    \uicontrol Options > \uicontrol {Text Editor} > \uicontrol Display >
+    \uicontrol Preferences > \uicontrol {Text Editor} > \uicontrol Display >
     \uicontrol {Highlight 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 Tools > \uicontrol Options >
+    To show the folding markers, select \uicontrol Edit > \uicontrol Preferences >
     \uicontrol {Text Editor} > \uicontrol Display >
     \uicontrol {Display folding markers}. This option is enabled by default.
 
@@ -113,7 +113,7 @@
 
     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
-    \uicontrol Tools > \uicontrol Options > \uicontrol {Text Editor} >
+    \uicontrol Edit > \uicontrol Preferences > \uicontrol {Text Editor} >
     \uicontrol Display and deselect \uicontrol {Animate matching parentheses}.
 
     You can use keyboard shortcuts to move within and between blocks. To go to
@@ -125,7 +125,7 @@
     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
-    \uicontrol Tools > \uicontrol Options > \uicontrol {Text Editor} >
+    \uicontrol Edit > \uicontrol Preferences > \uicontrol {Text Editor} >
     \uicontrol Behavior > \uicontrol {Enable smart selection changing}.
 
     \image qtcreator-options-text-editor-behavior.png "Text Editor Behavior options"

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

@@ -104,7 +104,7 @@
     \section1 Configuring External Tools
 
     You can change the configuration of preconfigured tools and configure
-    additional tools in \QC \uicontrol Options.
+    additional tools in \QC \uicontrol Preferences.
 
     \image qtcreator-external-tools.png
 
@@ -163,7 +163,7 @@
 
 
             To globally change the system environment from the one in which
-            \QC is started, select \uicontrol Tools > \uicontrol Options >
+            \QC is started, select \uicontrol Edit > \uicontrol 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

@@ -57,7 +57,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 Tools > \uicontrol Options > \uicontrol Help.
+            \uicontrol Help mode, select \uicontrol Edit > \uicontrol Preferences > \uicontrol Help.
     \endlist
 
     The following image displays the context sensitive help in the \uicontrol Edit
@@ -66,7 +66,7 @@
     \image qtcreator-context-sensitive-help.png
 
     If the help HTML file does not use a style sheet, you can change the font
-    family, style, and size in \uicontrol Tools > \uicontrol Options >
+    family, style, and size in \uicontrol Edit > \uicontrol Preferences >
     \uicontrol Help > \uicontrol General.
 
     \image qtcreator-help-options.png
@@ -87,8 +87,8 @@
 
     \section1 Viewing Function Tooltips
 
-    To hide function tooltips by default, select \uicontrol Tools >
+    To hide function tooltips by default, select \uicontrol Edit >
-    \uicontrol Options > \uicontrol {Text Editor} > \uicontrol Behavior >
+    \uicontrol Preferences > \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.
@@ -103,7 +103,7 @@
 
     By default, \QC registers only the latest available version of the
     documentation for each installed Qt module. To register all installed
-    documentation, select \uicontrol Tools > \uicontrol Options >
+    documentation, select \uicontrol Edit > \uicontrol Preferences >
     \uicontrol Kits > \uicontrol {Qt Versions} >
     \uicontrol {Register documentation}.
 
@@ -148,7 +148,7 @@
 
     \endlist
 
-    To import and export bookmarks, select \uicontrol Tools > \uicontrol Options
+    To import and export bookmarks, select \uicontrol Edit > \uicontrol Preferences
      > \uicontrol Help > \uicontrol General > \uicontrol {Import Bookmarks} or
      \uicontrol {Export Bookmarks}.
 
@@ -207,7 +207,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 Tools > \uicontrol Options >
+        \li To add the .qch file to \QC, select \uicontrol Edit > \uicontrol Preferences >
             \uicontrol Help > \uicontrol Documentation > \uicontrol Add.
 
     \endlist
@@ -219,8 +219,8 @@
     space, the help opens in the full-screen help mode.
 
     You can specify that the help always opens in full-screen mode or
-    is detached to an external window. Select \uicontrol Tools >
+    is detached to an external window. Select \uicontrol Edit >
-    \uicontrol Options > \uicontrol Help > \uicontrol General and specify
+    \uicontrol Preferences > \uicontrol Help > \uicontrol General and specify
     settings for displaying context-sensitive help
     in the \uicontrol {On context help} field. To detach the help window, select
     \uicontrol {Always Show in External Window}.
@@ -231,7 +231,7 @@
     \section1 Selecting the Start Page
 
     You can select the page to display when you open the \uicontrol Help mode in the
-    \uicontrol Tools > \uicontrol Options > \uicontrol Help > \uicontrol General
+    \uicontrol Edit > \uicontrol Preferences > \uicontrol Help > \uicontrol General
     > \uicontrol {On help start} field.
     To display the page and help views that were open when you exited the mode,
     select the \uicontrol {Show My Tabs from Last Session} option. However, Web pages
@@ -261,7 +261,7 @@
 
     \list 1
 
-        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Help >
+        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Help >
             \uicontrol Filters.
 
             \image qtcreator-help-filter-attributes.png "Filters tab in Help options"

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

@@ -50,7 +50,7 @@
 
     To view all functions available in \QC and the keyboard shortcuts defined
     for them, select
-    \uicontrol Tools > \uicontrol Options > \uicontrol Environment >
+    \uicontrol Edit > \uicontrol Preferences > \uicontrol Environment >
     \uicontrol Keyboard. The shortcuts are listed by category. To find a keyboard
     shortcut in the list, enter a function name or shortcut in the \uicontrol Filter
     field.
@@ -75,7 +75,7 @@
 
     To override the platform default value that determines whether
     keyboard shortcuts are shown in the labels of context menu items,
-    select \uicontrol Tools > \uicontrol Options > \uicontrol Environment >
+    select \uicontrol Edit > \uicontrol 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.
@@ -88,7 +88,7 @@
 
     \list 1
 
-        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Environment
+        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Environment
             > \uicontrol Keyboard.
 
         \li Select a command from the list.
@@ -290,7 +290,7 @@
                  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 Tools > \uicontrol Options >
+                 check box in \uicontrol Edit > \uicontrol Preferences >
                  \uicontrol Environment > \uicontrol System.
             \li  Ctrl+Q
     \endtable
@@ -388,8 +388,8 @@
             \li  Select the current block
 
                  The second press extends the selection to the parent block. To
-                 enable this behavior, select \uicontrol Tools >
+                 enable this behavior, select \uicontrol Edit >
-                 \uicontrol Options > \uicontrol {Text Editor} >
+                 \uicontrol Preferences > \uicontrol {Text Editor} >
                  \uicontrol Behavior >
                  \uicontrol {Enable smart selection changing}.
             \li  Ctrl+U

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

@@ -61,7 +61,7 @@
 
     The handling of build system based tests is disabled by default to avoid
     interference with code based parsers. To enable build system based tests,
-    select the respective test tool in \uicontrol Options > \uicontrol Testing
+    select the respective test tool in \uicontrol Preferences > \uicontrol Testing
     > \uicontrol General.
 
     The detection of tests is usually much faster for build system based
@@ -367,8 +367,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 Tools >
+    stop the test execution. To increase the timeout, select \uicontrol Edit >
-    \uicontrol Options > \uicontrol {Testing} > \uicontrol General.
+    \uicontrol Preferences > \uicontrol {Testing} > \uicontrol General.
 
     \section2 Selecting Tests to Run
 
@@ -415,7 +415,7 @@
     \section1 Specifying Test Settings
 
     To customize the handling of tests, test frameworks, and test tools, select
-    \uicontrol Tools > \uicontrol Options > \uicontrol {Testing} >
+    \uicontrol Edit > \uicontrol Preferences > \uicontrol {Testing} >
     \uicontrol General.
 
     \image qtcreator-autotests-options.png
@@ -464,8 +464,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 Tools >
+    \uicontrol {Benchmark Metrics} group in \uicontrol Edit >
-    \uicontrol Options > \uicontrol {Testing} > \uicontrol {Qt Test}:
+    \uicontrol Preferences > \uicontrol {Testing} > \uicontrol {Qt Test}:
     walltime, CPU tick counter, event counter, Valgrind Callgrind, and Linux
     Perf. For more information, see \l{Creating a Benchmark}.
 
@@ -487,8 +487,8 @@
 
     \section2 Specifying Settings for Running Google Tests
 
-    To specify settings for running Google tests, select \uicontrol Tools >
+    To specify settings for running Google tests, select \uicontrol Edit >
-    \uicontrol Options > \uicontrol {Testing} > \uicontrol {Google Test}.
+    \uicontrol Preferences > \uicontrol {Testing} > \uicontrol {Google Test}.
 
     \image qtcreator-autotests-options-google.png
 
@@ -515,8 +515,8 @@
     \section2 Specifying Settings for Running Boost Tests
 
     \list 1
-        \li To specify settings for running Boost tests, select \uicontrol Tools
+        \li To specify settings for running Boost tests, select \uicontrol Edit
-            > \uicontrol Options > \uicontrol {Testing} >
+            > \uicontrol Preferences > \uicontrol {Testing} >
             \uicontrol {Boost Test}.
             \image qtcreator-autotests-options-boost.png
         \li In the \uicontrol {Log format} field, select the error report
@@ -539,7 +539,7 @@
     \section2 Specifying Settings for Running Catch2 Tests
     \list 1
         \li To specify settings for running Catch2 tests, select
-            \uicontrol Tools > \uicontrol Options > \uicontrol {Testing} >
+            \uicontrol Edit > \uicontrol Preferences > \uicontrol {Testing} >
             \uicontrol {Catch Test}.
             \image qtcreator-autotests-options-catch2.png "Catch Test options"
         \li Select the \uicontrol {Show success} check box to show succeeding
@@ -571,7 +571,7 @@
     \section2 Specifying Settings for Running CTest-Based Tests
     \list 1
         \li To specify settings for running CTest-based tests, select
-        \uicontrol Tools > \uicontrol Options > \uicontrol {Testing} >
+        \uicontrol Edit > \uicontrol Preferences > \uicontrol {Testing} >
         \uicontrol {CTest}.
             \image qtcreator-autotests-options-ctest.png "CTest options"
         \li Select the \uicontrol {Output on failure} check box to show test
@@ -604,8 +604,8 @@
     However, if a Qt test crashes, it might not produce complete XML code that
     can be parsed, which might lead to information loss. The lost information
     might be retrievable when viewing the results as plain text.
-    To view the results of Qt tests as plain text, select \uicontrol Tools >
+    To view the results of Qt tests as plain text, select \uicontrol Edit >
-    \uicontrol Options > \uicontrol {Testing} > \uicontrol {Qt Test}, and
+    \uicontrol Preferences > \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-tos.qdoc

@@ -111,8 +111,8 @@
 
     \section1 Find a specific setting
 
-    To find specific settings in \uicontrol Tools > \uicontrol Options,
+    To find specific settings in \uicontrol Edit > \uicontrol Preferences,
-    use the filter located at the top left of the \uicontrol Options dialog box.
+    use the filter located at the top left of the \uicontrol Preferences dialog.
 
     \section1 View output
 
@@ -145,8 +145,8 @@
     You can see the keyboard shortcut for a menu command in the menu
     or the tooltip for a button.
 
-    To customize, import, or export keyboard shortcuts, select \uicontrol Tools >
+    To customize, import, or export keyboard shortcuts, select \uicontrol Edit >
-    \uicontrol Options > \uicontrol Environment > \uicontrol Keyboard.
+    \uicontrol Preferences > \uicontrol Environment > \uicontrol Keyboard.
 
     \section1 Run \QC from the command line
 
@@ -194,7 +194,7 @@
 
     If an instance of a class is derived from QObject, and you would like to
     find all other objects connected to one of your object's slots using
-    Qt's signals and slots mechanism, select \uicontrol Tools > \uicontrol Options
+    Qt's signals and slots mechanism, select \uicontrol Edit > \uicontrol Preferences
     > \uicontrol{Debugger} > \uicontrol{Locals} > \uicontrol{Use Debugging Helper}.
 
     In the \uicontrol{Locals} view, expand the object's entry and open
@@ -213,7 +213,7 @@
     To switch off the debugging helpers:
     \list 1
 
-        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Debugger >
+        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Debugger >
             \uicontrol{Locals}.
 
         \li Uncheck the \uicontrol{Use Debugging Helper} checkbox.
@@ -227,7 +227,7 @@
 
     \list 1
 
-        \li Select \uicontrol Tools > \uicontrol Options >
+        \li Select \uicontrol Edit > \uicontrol Preferences >
             \uicontrol Debugger > \uicontrol General.
 
         \li Select the \uicontrol {Use tooltips in main editor while debugging} check
@@ -253,7 +253,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 Tools > \uicontrol Options >
+    To create locator filters, select \uicontrol Edit > \uicontrol Preferences >
     \uicontrol Locator > \uicontrol Add.
 
     For more information, see \l{Creating Locator Filters}.
@@ -274,7 +274,7 @@
     \section1 Add a license header template for C++ code
 
     A file containing a license header for C++ can be specified under
-    \uicontrol Tools > \uicontrol Options > \uicontrol C++ >
+    \uicontrol Edit > \uicontrol Preferences > \uicontrol C++ >
     \uicontrol {License Template}. It may contain special placeholders enclosed
     in \c{%%} that are replaced when generating a new file:
 
@@ -322,7 +322,7 @@
     \section1 Add my own code snippets to the auto-complete menu
 
     You can add, modify, and remove snippets in the snippet editor.
-    To open the editor, select \uicontrol Tools > \uicontrol Options
+    To open the editor, select \uicontrol Edit > \uicontrol Preferences
     > \uicontrol {Text Editor} > \uicontrol Snippets.
 
     For more information, see \l {Adding and Editing Snippets}.
@@ -344,7 +344,7 @@
 
     \section1 Configure the amount of recent files shown
 
-    Select \uicontrol Tools > \uicontrol Options, and change the value of the
+    Select \uicontrol Edit > \uicontrol Preferences, and change the value of the
     list under \uicontrol Environment > \uicontrol System
     > \uicontrol {Maximum number of entries in "Recent Files"}.
 

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

@@ -54,7 +54,7 @@
     compiler. What should I do?}
 
     Make sure that the application is in your system PATH when starting \QC.
-    Also select \uicontrol Tools > \uicontrol Options to check the settings
+    Also select \uicontrol Edit > \uicontrol 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.
 
@@ -65,7 +65,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 Tools > \uicontrol Options >
+    To change the language, select \uicontrol Edit > \uicontrol 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.
@@ -173,7 +173,7 @@
     \uicontrol Help mode.
 
     To view the documentation that is available and to add documentation,
-    select \uicontrol Tools > \uicontrol Options > \uicontrol Help >
+    select \uicontrol Edit > \uicontrol Preferences > \uicontrol Help >
     \uicontrol Documentation. For more information, see
     \l{Adding External Documentation}.
 
@@ -260,7 +260,7 @@
 
     For console applications that require input, select \uicontrol Projects >
     \uicontrol {Run Settings} > \uicontrol {Run in terminal}. To specify the
-    terminal to use, select \uicontrol Tools > \uicontrol Options >
+    terminal to use, select \uicontrol Edit > \uicontrol Preferences >
     \uicontrol Environment > \uicontrol System.
 
     \b {On Windows:} Output is displayed differently for \e{console

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

@@ -106,7 +106,7 @@
     To determine what data is transmitted to the backend storage:
 
     \list 1
-        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Telemetry
+        \li Select \uicontrol Edit > \uicontrol 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

@@ -66,7 +66,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 Tools > \uicontrol Options >
+    You can edit the settings later in \uicontrol Edit > \uicontrol Preferences >
     \uicontrol Devices > \uicontrol Devices.
 
     \image qtcreator-boot2qt-device-configurations.png "Devices dialog"
@@ -107,10 +107,10 @@
     \list 1
         \li Make sure that your device can be reached via an IP address or
             connect it with a USB connection.
-        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Kits >
+        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits >
             \uicontrol {Qt Versions} > \uicontrol Add to add the Qt version
             for Boot2Qt.
-        \li Select \uicontrol Tools > \uicontrol Options > \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}
@@ -119,7 +119,7 @@
             parameters for connecting to the devices over the network (\QC
             automatically detects devices connected with USB):
             \list 1
-                \li Select \uicontrol Tools > \uicontrol Options >
+                \li Select \uicontrol Edit > \uicontrol Preferences >
                     \uicontrol Devices > \uicontrol Devices > \uicontrol Add >
                     \uicontrol Boot2Qt > \uicontrol {Finish}.
                     \image qtcreator-devices-boot2qt.png "Boot2Qt Network Device Setup wizard"
@@ -136,7 +136,7 @@
                     these is the SSH port number, which is available in
                     the variable \c %{Device:SshPort}.
             \endlist
-        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Kits >
+        \li Select \uicontrol Edit > \uicontrol 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

@@ -41,8 +41,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 Tools >
+    directories where the tools are installed in \uicontrol Edit >
-    \uicontrol Options > \uicontrol Devices > \uicontrol SSH:
+    \uicontrol Preferences > \uicontrol Devices > \uicontrol SSH:
 
     \image qtcreator-ssh-options.png
 
@@ -82,7 +82,7 @@
 
     \list 1
 
-        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Devices
+        \li Select \uicontrol Edit > \uicontrol 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

@@ -29,7 +29,7 @@
     \section2 Managing Device Processes
 
     You can view processes running on devices and kill them. Select
-    \uicontrol Tools > \uicontrol Options > \uicontrol Devices >
+    \uicontrol Edit > \uicontrol 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

@@ -49,7 +49,7 @@
     {kit}.
 
     You use a wizard to create the connections. You can edit the settings later
-    in \uicontrol Tools > \uicontrol Options > \uicontrol Devices >
+    in \uicontrol Edit > \uicontrol Preferences > \uicontrol Devices >
     \uicontrol Devices.
 
     \image qtcreator-linux-device-configurations.png "Devices dialog"
@@ -76,11 +76,11 @@
 
         \li Make sure that your device can be reached via an IP address.
 
-        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Kits >
+        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits >
             \uicontrol {Qt Versions} > \uicontrol Add to add the Qt version
             for embedded Linux.
 
-        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Kits >
+        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits >
             \uicontrol Compilers > \uicontrol Add to add the compiler for
             building the applications.
 
@@ -89,7 +89,7 @@
 
             \list a
 
-                \li Select \uicontrol Tools > \uicontrol Options >
+                \li Select \uicontrol Edit > \uicontrol Preferences >
                     \uicontrol Devices > \uicontrol Devices > \uicontrol Add >
                     \uicontrol {Generic Linux Device}
                     > \uicontrol {Start Wizard}.
@@ -133,7 +133,7 @@
             the SSH port number, which is available in the variable \c %{Device:SshPort}.
 
 
-        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Kits >
+        \li Select \uicontrol Edit > \uicontrol 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 choose
             \uicontrol {Generic Linux Device} for the device type.

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

@@ -82,7 +82,7 @@
     \section2 Specifying MCU Settings
 
     To configure a connection between \QC and your MCU board, select
-    \uicontrol Tools > \uicontrol Options > \uicontrol Devices >
+    \uicontrol Edit > \uicontrol Preferences > \uicontrol Devices >
     \uicontrol MCU:
 
     \image qtcreator-mcu-options.png "MCU options"
@@ -143,7 +143,7 @@
 
     \image qtcreator-mcu-device.png "MCU devices"
 
-    To add MCU devices, select \uicontrol Tools > \uicontrol Options >
+    To add MCU devices, select \uicontrol Edit > \uicontrol Preferences >
     \uicontrol Devices > \uicontrol Add > \uicontrol {MCU Device} >
     \uicontrol {Start Wizard}:
 
@@ -163,8 +163,8 @@
 
     \image qtcreator-mcu-kit.png "MCU kits"
 
-    You can edit and/or remove individual kits in \uicontrol Tools >
+    You can edit and/or remove individual kits in \uicontrol Edit >
-    \uicontrol Options > \uicontrol Kits.
+    \uicontrol Preferences > \uicontrol Kits.
 
     However, for adding new kits you should use the \uicontrol {Create Kit}
     button in the {Qt for MCUs} settings tab. This method adds the paths to

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

@@ -55,7 +55,7 @@
 
     \list 1
 
-        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Meson >
+        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Meson >
             \uicontrol Tools > \uicontrol Add.
 
             \image qtcreator-mesonexecutable.png
@@ -70,7 +70,7 @@
     \endlist
 
     Select the
-    \uicontrol Tools > \uicontrol Options > \uicontrol Kits > \uicontrol Kits
+    \uicontrol Edit > \uicontrol 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 options"

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

@@ -67,15 +67,15 @@
     available in \QC. If it does not, you must add the kits yourself to tell
     \QC where everything is.
 
-    To add kits, select \uicontrol Tools > \uicontrol Options >
+    To add kits, select \uicontrol Edit > \uicontrol Preferences >
     \uicontrol Kits > \uicontrol Add.
 
     For more information, see \l{Adding 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 you know you have
-    installed a Qt version, but it is not listed in \uicontrol Tools >
+    installed a Qt version, but it is not listed in \uicontrol Edit >
-    \uicontrol Options > \uicontrol Kits > \uicontrol {Qt Versions}, select
+    \uicontrol Preferences > \uicontrol Kits > \uicontrol {Qt Versions}, select
     \uicontrol {Link with Qt}.
 
     If the Qt version is still not listed under \uicontrol Auto-detected, select
@@ -83,8 +83,8 @@
 
     For more information, see \l{Adding Qt Versions}.
 
-    Also check that your compiler is listed in \uicontrol Tools >
+    Also check that your compiler is listed in \uicontrol Edit >
-    \uicontrol Options > \uicontrol Kits > \uicontrol {Compilers}.
+    \uicontrol Preferences > \uicontrol Kits > \uicontrol {Compilers}.
 
     For more information, see \l{Adding Compilers}.
 
@@ -94,7 +94,7 @@
     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 Tools > \uicontrol Options >
+    To add devices, select \uicontrol Edit > \uicontrol Preferences >
     \uicontrol Devices > \uicontrol Devices > \uicontrol Add.
 
     For more information, see \l{Connecting Devices}.
@@ -104,7 +104,7 @@
     You can use \QC with your favorite keyboard shortcuts.
 
     To view and edit all keyboard shortcuts defined in \QC, select
-    \uicontrol Tools > \uicontrol Options > \uicontrol Environment >
+    \uicontrol Edit > \uicontrol Preferences > \uicontrol Environment >
     \uicontrol Keyboard. For more information, see \l{Keyboard Shortcuts}.
 
     \section1 Changing Color Schemes
@@ -112,7 +112,7 @@
     Themes enable you to customize the appearance of the \QC UI: widgets,
     colors, and icons.
 
-    To switch themes, select \uicontrol Tools > \uicontrol Options >
+    To switch themes, select \uicontrol Edit > \uicontrol Preferences >
     \uicontrol Environment, and then select a theme
     in the \uicontrol Theme field.
 
@@ -122,7 +122,7 @@
     ones. The color schemes apply to highlighting C++ files, QML files, and
     generic files.
 
-    To change the color scheme, select \uicontrol Tools > \uicontrol Options >
+    To change the color scheme, select \uicontrol Edit > \uicontrol Preferences >
     \uicontrol {Text Editor} > \uicontrol {Fonts & Color}.
 
     For more information, see \l{Defining Color Schemes}.
@@ -133,8 +133,8 @@
     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 Tools >
+    To download and use highlight definition files, select \uicontrol Edit >
-    \uicontrol Options > \uicontrol {Text Editor} > \uicontrol {Generic Highlighter}.
+    \uicontrol Preferences > \uicontrol {Text Editor} > \uicontrol {Generic Highlighter}.
 
     For more information, see \l{Generic Highlighting}.
 
@@ -145,7 +145,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 Tools > \uicontrol Options >
+    To open the snippet editor, select \uicontrol Edit > \uicontrol Preferences >
     \uicontrol {Text Editor} > \uicontrol Snippets.
 
     For more information, see \l{Editing Code Snippets}.
@@ -157,7 +157,7 @@
     \QC. Once it is set up correctly on the development PC, it should just work.
 
     However, some configuration options are available and you can set them in
-    \uicontrol Tools > \uicontrol Options > \uicontrol {Version Control} >
+    \uicontrol Edit > \uicontrol Preferences > \uicontrol {Version Control} >
     \uicontrol General.
 
     For more information about the supported functions, see

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

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

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

@@ -91,7 +91,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 Tools > \uicontrol Options \uicontrol Environment >
+    specified in \uicontrol Edit > \uicontrol Preferences \uicontrol Environment >
     \uicontrol Update.
 
     For more information on the requirements for each platform, see:

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

@@ -41,7 +41,7 @@
     \uicontrol {Build Directory} field.
 
     To make in-source builds the default option for all projects, select
-    \uicontrol Tools > \uicontrol Options > \uicontrol {Build & Run} >
+    \uicontrol Edit > \uicontrol Preferences > \uicontrol {Build & Run} >
     \uicontrol {Default Build Properties}, and enter a period (.) in the
     \uicontrol {Default build directory} field.
 
@@ -68,14 +68,14 @@
 
     \section1 Global qmake Settings
 
-    To specify settings for all qmake builds, select \uicontrol Tools
+    To specify settings for all qmake builds, select \uicontrol Edit
-    > \uicontrol Options > \uicontrol {Build & Run} >
+    > \uicontrol Preferences > \uicontrol {Build & Run} >
     \uicontrol Qmake.
 
     \image qtcreator-build-settings-qmake.png "qmake build and run options"
 
-    To set the default build properties, select \uicontrol Tools
+    To set the default build properties, select \uicontrol Edit
-    > \uicontrol Options > \uicontrol {Build & Run} >
+    > \uicontrol Preferences > \uicontrol {Build & Run} >
     \uicontrol {Default Build Properties}.
 
     \image qtcreator-build-settings-default.png "default build options"
@@ -92,8 +92,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 Tools
+    You can specify default behavior for compiling QML code in \uicontrol Edit
-    > \uicontrol Options > \uicontrol {Build & Run} > \uicontrol Qmake >
+    > \uicontrol Preferences > \uicontrol {Build & Run} > \uicontrol Qmake >
     \uicontrol {Use qmlcachegen}.
 
     \section1 qmake Build Steps

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

@@ -35,7 +35,7 @@
     for found patterns in \l Issues.
 
     To view or add custom output parsers, select
-    \uicontrol Tools > \uicontrol Options >
+    \uicontrol Edit > \uicontrol Preferences >
     \uicontrol {Build & Run} > \uicontrol {Custom Output Parsers}.
 
     \image qtcreator-custom-parser-list.png
@@ -62,7 +62,7 @@
     To create a custom output parser:
 
     \list 1
-        \li Select \uicontrol Tools > \uicontrol Options >
+        \li Select \uicontrol Edit > \uicontrol Preferences >
             \uicontrol {Build & Run} > \uicontrol {Custom Output Parsers}
             > \uicontrol Add.
         \li In the \uicontrol {Error message capture pattern} field, specify

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

@@ -159,7 +159,7 @@
     \image qtcreator-cpp-class-wizard.png "Enter Class Name dialog"
 
     The names of the header and source file are based on the class name. To
-    change the default suffix of a file, select \uicontrol Tools > \uicontrol Options >
+    change the default suffix of a file, select \uicontrol Edit > \uicontrol Preferences >
     \uicontrol {C++} > \uicontrol {File Naming}.
 
     \image qtcreator-options-cpp-files.png "File Naming tab in Options"

doc/qtcreator/src/projects/creator-only/creator-projects-build-systems.qdocinc

@@ -62,12 +62,12 @@
     information, see \l{Setting Up Qbs}.
 
     To change the location of the project directory, and to specify settings
-    for building and running projects, select \uicontrol Tools >
+    for building and running projects, select \uicontrol Edit >
-    \uicontrol Options > \uicontrol {Build & Run} > \uicontrol General. The
+    \uicontrol Preferences > \uicontrol {Build & Run} > \uicontrol General. The
     \uicontrol CMake tab contains additional settings for CMake. You can find
-    more settings for CMake in \uicontrol Tools > \uicontrol Options >
+    more settings for CMake in \uicontrol Edit > \uicontrol Preferences >
-    \uicontrol Kits > \uicontrol CMake and for Qbs in \uicontrol Tools >
+    \uicontrol Kits > \uicontrol CMake and for Qbs in \uicontrol Edit >
-    \uicontrol Options > \uicontrol Qbs.
+    \uicontrol Preferences > \uicontrol Qbs.
 
     To specify build and run settings for different target platforms,
     select \uicontrol Projects. For more information on the options you have,

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

@@ -120,8 +120,8 @@
     \section1 Building with CMake
 
     \QC automatically runs CMake when you make changes to \c {CMakeLists.txt}
-    files. To disable this feature, select \uicontrol Tools >
+    files. To disable this feature, select \uicontrol Edit >
-    \uicontrol Options > \uicontrol Kits > \uicontrol CMake. Select the CMake
+    \uicontrol Preferences > \uicontrol Kits > \uicontrol CMake. Select the CMake
     executable to edit, and then deselect the \uicontrol {Autorun CMake} check
     box.
 
@@ -131,7 +131,7 @@
 
     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 Tools
+    building will take more time. To enable this option, select \uicontrol Edit
-    > \uicontrol Options > \uicontrol {Build & Run} > \uicontrol qmake >
+    > \uicontrol Preferences > \uicontrol {Build & Run} > \uicontrol qmake >
     \uicontrol {Run qmake on every build}.
 */

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

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

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

@@ -43,8 +43,8 @@
     for and running it on a particular platform.
 
     \QC automatically detects the compilers that are registered by your
-    system or by the Qt Installer and lists them in \uicontrol Tools >
+    system or by the Qt Installer and lists them in \uicontrol Edit >
-    \uicontrol Options > \uicontrol Kits > \uicontrol Compilers:
+    \uicontrol Preferences > \uicontrol Kits > \uicontrol Compilers:
 
     \image qtcreator-toolchains.png
 
@@ -133,10 +133,10 @@
     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 Tools >
+    You specify the compiler to use for each kit in \uicontrol Edit >
-    \uicontrol Options > \uicontrol Kits.
+    \uicontrol Preferences > \uicontrol Kits.
 
-    To add a C or C++ compiler, select \uicontrol Tools > \uicontrol Options >
+    To add a C or C++ compiler, select \uicontrol Edit > \uicontrol Preferences >
     \uicontrol Kits > \uicontrol Compilers > \uicontrol Add. Select a compiler
     in the list, and then select \uicontrol C or \uicontrol C++.
 
@@ -192,8 +192,8 @@
 
     \section1 Adding Nim Compilers
 
-    To build an application using the Nim Compiler, select \uicontrol Tools >
+    To build an application using the Nim Compiler, select \uicontrol Edit >
-    \uicontrol Options > \uicontrol Kits > \uicontrol Compilers >
+    \uicontrol Preferences > \uicontrol Kits > \uicontrol Compilers >
     \uicontrol Add > \uicontrol Nim, and specify the path to the directory where
     the compiler is located.
 
@@ -209,7 +209,7 @@
 
     \list 1
 
-        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Kits >
+        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits >
             \uicontrol Compilers > \uicontrol Add > \uicontrol Custom >
             \uicontrol C or \uicontrol C++.
 

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

@@ -368,8 +368,8 @@
     it. Triggering this keyboard shortcut will directly open the wizard without
     the need to navigate to \uicontrol File > \uicontrol {New File} or \uicontrol {New Project}.
 
-    Keyboard shortcuts for wizards can be set in \uicontrol Tools >
+    Keyboard shortcuts for wizards can be set in \uicontrol Edit >
-    \uicontrol Options > \uicontrol Environment > \uicontrol Keyboard >
+    \uicontrol Preferences > \uicontrol Environment > \uicontrol Keyboard >
     \uicontrol Wizard. All wizard actions start with \uicontrol Impl there.
 
     \section1 Related Topics

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

@@ -103,8 +103,8 @@
 
     \QC has some actions that can improve the wizard development process. These
     are by default not bound to any keyboard shortcuts and can thus not be
-    triggered. To enable them, assign keyboard shortcuts in \uicontrol Tools >
+    triggered. To enable them, assign keyboard shortcuts in \uicontrol Edit >
-    \uicontrol Options > \uicontrol Environment > \uicontrol Keyboard >
+    \uicontrol Preferences > \uicontrol Environment > \uicontrol Keyboard >
     \uicontrol Wizard.
 
     The following actions can help with wizard development:

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

@@ -43,14 +43,14 @@
 
     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 Tools > \uicontrol Options >
+    To override this choice, select \uicontrol Edit > \uicontrol Preferences >
     \uicontrol Kits.
 
     To add debuggers:
 
     \list 1
 
-        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Kits >
+        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits >
             \uicontrol Debuggers > \uicontrol Add.
 
             \image qtcreator-options-build-run-debuggers.png

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

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

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

@@ -47,15 +47,15 @@
 
     The \uicontrol {Configure Project} tab displays a list of \l{glossary-buildandrun-kit}{kits}
     for building and running projects, that are installed on the development PC and
-    configured in \uicontrol Tools > \uicontrol Options > \uicontrol Kits.
+    configured in \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits.
     Select the kits that you want to build and run the project with.
 
     \image qtcreator-open-project-kits.png "Configure Project tab"
 
     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 Options link, or select \uicontrol Tools >
+    select the \uicontrol Preferences link, or select \uicontrol Edit >
-    \uicontrol Options > \uicontrol Kits.
+    \uicontrol Preferences > \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

@@ -39,8 +39,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 Tools >
+    To check which Qbs version is being used, select \uicontrol Edit >
-    \uicontrol Options > \uicontrol Qbs > \uicontrol General.
+    \uicontrol Preferences > \uicontrol Qbs > \uicontrol General.
 
     \section1 Building Qbs
 
@@ -66,7 +66,7 @@
     To specify settings for Qbs:
 
     \list 1
-        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Qbs.
+        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Qbs.
             \image qtcreator-options-qbs.png
         \li Deselect the \uicontrol {Use \QC settings directory for Qbs} check
             box to store Qbs profiles in the Qbs settings directory.
@@ -81,7 +81,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 Tools > \uicontrol Options > \uicontrol Kits.
+            select \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits.
             For more information, see \l{Editing Qbs Profiles}.
     \endlist
 

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

@@ -63,7 +63,7 @@
     To link to a Qt installation:
 
     \list 1
-        \li Select \uicontrol Tools > \uicontrol Options >
+        \li Select \uicontrol Edit > \uicontrol Preferences >
             (or \uicontrol {Qt Creator} > \uicontrol Preferences on
             \macos) > \uicontrol Kits > \uicontrol {Qt Versions} >
             \uicontrol {Link with Qt}.
@@ -84,7 +84,7 @@
 
     You specify the Qt version to use for each \l{glossary-buildandrun-kit}
     {kit} for building and running your projects
-    in \uicontrol Tools > \uicontrol Options > \uicontrol Kits, as described
+    in \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits, as described
     in \l{Specifying Kit Settings}.
 
     \section1 Setting Up New Qt Versions
@@ -93,7 +93,7 @@
 
         \list 1
 
-            \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Kits >
+            \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits >
                 \uicontrol {Qt Versions} > \uicontrol Add.
 
             \li Select the qmake executable for the Qt version that you want to

doc/qtcreator/src/projects/creator-only/creator-projects-settings-code-style.qdoc

@@ -58,10 +58,10 @@
     \image qtcreator-code-style-clang-format.png "Clang Format Code Style settings in Projects mode"
 
     To specify global code style settings sets for C++ files, select
-    \uicontrol Tools > \uicontrol Options > \uicontrol C++.
+    \uicontrol Edit > \uicontrol Preferences > \uicontrol C++.
 
-    To specify global code style settings sets for QML files, select \uicontrol {Tools
+    To specify global code style settings sets for QML files, select
-    > Options > Qt Quick}.
+    \uicontrol Edit > \uicontrol Preferences > \uicontrol {Qt Quick}.
 
     To configure the editor behavior for the current project:
 

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

@@ -42,8 +42,8 @@
 
     You can configure the text editor according to your needs. You can specify
     editor behavior either globally for all projects or separately for each
-    project. To specify global editor behavior, select \uicontrol Tools >
+    project. To specify global editor behavior, select \uicontrol Edit >
-    \uicontrol Options > \uicontrol {Text Editor} > \uicontrol Behavior.
+    \uicontrol Preferences > \uicontrol {Text Editor} > \uicontrol Behavior.
 
     To configure the text editor behavior for the current project:
 

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

@@ -41,7 +41,7 @@
     based on your project requirements.
 
     To globally change the system environment from the one in which
-    \QC is started, select \uicontrol Tools > \uicontrol Options >
+    \QC is started, select \uicontrol Edit > \uicontrol 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

@@ -58,8 +58,8 @@
 
     \image qtcreator-project-kits.png
 
-    The list displays kits that are configured in \uicontrol Tools >
+    The list displays kits that are configured in \uicontrol Edit >
-    \uicontrol Options > \uicontrol Kits. If the kit configuration is not
+    \uicontrol Preferences > \uicontrol Kits. If the kit configuration is not
     suitable for the project type, warning and error icons are displayed.
     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

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

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

@@ -33,8 +33,8 @@
     the directory of the build result.
 
     For console applications, check the \uicontrol{Run in terminal} check box.
-    To specify the terminal to use on Linux and \macos, select \uicontrol Tools
+    To specify the terminal to use on Linux and \macos, select \uicontrol Edit
-    > \uicontrol Options > \uicontrol Environment > \uicontrol System.
+    > \uicontrol Preferences > \uicontrol Environment > \uicontrol System.
 
     To run with special environment variables set up, select them in the
     \uicontrol {Run Environment} section. For more information, see
@@ -52,8 +52,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 Tools >
+    library linking for all projects, select \uicontrol Edit >
-    \uicontrol Options > \uicontrol {Build & Run}, and then deselect the
+    \uicontrol Preferences > \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

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

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

@@ -64,7 +64,7 @@
 
     Typically, only a subset of the kit settings is relevant for a particular
     setup. Therefore, \QC plugins register sets of relevant settings that you
-    can view and modify in \uicontrol Tools > \uicontrol Options >
+    can view and modify in \uicontrol Edit > \uicontrol Preferences >
     \uicontrol Kits. For example, if you use CMake to build all your projects,
     you can hide Qbs and qmake settings by default.
 
@@ -81,7 +81,7 @@
 
     \list 1
 
-        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Kits >
+        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits >
             \uicontrol Add.
 
             \image qtcreator-kits-add.png
@@ -195,8 +195,8 @@
 
     \section1 Editing Qbs Profiles
 
-    To view the Qbs profile associated with the kit, select \uicontrol Tools >
+    To view the Qbs profile associated with the kit, select \uicontrol Edit >
-    \uicontrol Options > \uicontrol Qbs > \uicontrol Profiles.
+    \uicontrol Preferences > \uicontrol Qbs > \uicontrol Profiles.
 
     \image creator-qbs-profiles.png "Qbs Profiles tab"
 
@@ -209,7 +209,7 @@
 
     \list 1
 
-        \li In \uicontrol Tools > \uicontrol Options > \uicontrol Kits, select
+        \li In \uicontrol Edit > \uicontrol 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-projects-running.qdoc

@@ -47,7 +47,7 @@
 
     To run executable files without deploying them first, select \uicontrol Build >
     \uicontrol {Run Without Deployment}. To make this the default option, deselect the
-    \uicontrol Tools > \uicontrol Options > \uicontrol {Build & Run} >
+    \uicontrol Edit > \uicontrol Preferences > \uicontrol {Build & Run} >
     \uicontrol General > \uicontrol {Always deploy project before running it}
     check box.
 

doc/qtcreator/src/qnx/creator-developing-qnx.qdoc

@@ -51,7 +51,7 @@
 
     \section1 Adding Kits for QNX Devices
 
-    To view QNX device settings, select \uicontrol Tools > \uicontrol Options >
+    To view QNX device settings, select \uicontrol Edit > \uicontrol Preferences >
     \uicontrol Devices > \uicontrol QNX. Select the \uicontrol {Generate kits}
     check box to allow \QC to generate kits for QNX development. For more
     information about how to create the kits manually, see \l {Adding Kits}.

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

@@ -143,8 +143,8 @@
         \li Select \l{glossary-buildandrun-kit}{kits} for the platforms that
             you want to build the application for.
 
-            \note Kits are listed if they have been specified in \uicontrol
+            \note Kits are listed if they have been specified in \uicontrol Edit
-            Tools > \uicontrol Options > \uicontrol Kits (on Windows and Linux)
+            > \uicontrol Preferences > \uicontrol Kits (on Windows and Linux)
             or in \uicontrol {\QC} > \uicontrol Preferences >
             \uicontrol Kits (on \macos).
             For more information, see \l {Adding Kits}.
@@ -221,8 +221,8 @@
         \li Select \l{glossary-buildandrun-kit}{kits} for the platforms that
             you want to build the application for.
 
-            \note Kits are listed if they have been specified in \uicontrol
+            \note Kits are listed if they have been specified in \uicontrol Edit
-            Tools > \uicontrol Options > \uicontrol Kits (on Windows and Linux)
+            > \uicontrol Preferences > \uicontrol Kits (on Windows and Linux)
             or in \uicontrol {\QC} > \uicontrol Preferences >
             \uicontrol Kits (on \macos).
             For more information, see \l {Adding Kits}.

doc/qtcreator/src/qtquick/creator-only/qtquick-tutorial-create-empty-project.qdocinc

@@ -70,8 +70,8 @@
             applications for mobile devices, select kits also for Android and
             iOS.
 
-            \note Kits are listed if they have been specified in \uicontrol
+            \note Kits are listed if they have been specified in \uicontrol Edit
-            Tools > \uicontrol Options > \uicontrol Kits (on Windows and Linux)
+            > \uicontrol Preferences > \uicontrol Kits (on Windows and Linux)
             or in \uicontrol {\QC} > \uicontrol Preferences >
             \uicontrol Kits (on \macos).
             For more information, see \l {Adding Kits}.

doc/qtcreator/src/qtquick/qtquick-profiler.qdoc

@@ -146,7 +146,7 @@
 
     You can specify flushing settings for the QML Profiler either globally for
     all projects or separately for each project. To specify global settings,
-    select \uicontrol Tools > \uicontrol Options > \uicontrol Analyzer.
+    select \uicontrol Edit > \uicontrol Preferences > \uicontrol Analyzer.
 
     To specify custom QML Profiler settings for a particular project, select
     \uicontrol Projects > \uicontrol Run and then select \uicontrol Custom in

doc/qtcreator/src/qtquick/qtquick-toolbars.qdoc

@@ -45,7 +45,7 @@
     . Select the icon to open the toolbar.
 
     To open toolbars immediately when you select a QML type, select
-    \uicontrol Tools > \uicontrol Options > \uicontrol {Qt Quick} >
+    \uicontrol Edit > \uicontrol Preferences > \uicontrol {Qt Quick} >
     \uicontrol {QML/JS Editing} > \uicontrol {Always show Qt Quick Toolbar}.
 
     Drag the toolbar to pin it to another location. Select

doc/qtcreator/src/user-interface/creator-file-system-view.qdoc

@@ -46,8 +46,8 @@
     in the menu (1). Select \uicontrol Home to move to the user's home
     directory. Further, you can select a project to move to an open project
     or \uicontrol Projects to move to the directory specified in the
-    \uicontrol {Projects directory} field in \uicontrol Tools >
+    \uicontrol {Projects directory} field in \uicontrol Edit >
-    \uicontrol Options > \uicontrol {Build & Run} > \uicontrol General.
+    \uicontrol Preferences > \uicontrol {Build & Run} > \uicontrol General.
 
     The file that is currently active in the editor determines which folder
     is displayed in the \uicontrol {File System} view:
@@ -76,7 +76,7 @@
         \li Show the file or directory in the file explorer.
         \li Open a terminal window in the selected directory or in the directory
             that contains the file. To specify the terminal to use on Linux and
-            \macos, select \uicontrol Tools > \uicontrol Options >
+            \macos, select \uicontrol Edit > \uicontrol Preferences >
             \uicontrol Environment > \uicontrol System.
         \li Search from the selected directory.
         \li View file properties, such as name, path, MIME type, default editor,

doc/qtcreator/src/user-interface/creator-open-documents-view.qdoc

@@ -50,7 +50,7 @@
     \section1 Specifying Settings for Opening Files
 
     To specify settings for opening files and handling open files, select
-    \uicontrol Tools > \uicontrol Options > \uicontrol Environment >
+    \uicontrol Edit > \uicontrol Preferences > \uicontrol Environment >
     \uicontrol System:
 
     \image qtcreator-options-environment-system.png "Environment options System tab"

doc/qtcreator/src/user-interface/creator-projects-view.qdoc

@@ -97,8 +97,8 @@
         \endif
         \li Search from the selected directory.
         \li Open a terminal window in the project directory. To specify the
-            terminal to use on Linux and \macos, select \uicontrol Tools >
+            terminal to use on Linux and \macos, select \uicontrol Edit >
-            \uicontrol Options > \uicontrol Environment > \uicontrol System.
+            \uicontrol Preferences > \uicontrol Environment > \uicontrol System.
         \li Open a terminal window in the project directory that is configured
             for building or running the project.
         \li Expand or collapse the tree view to show or hide all files and
@@ -106,8 +106,8 @@
         \li Close all files in a project.
         \li Close the selected project or all projects except the selected
             one. By default, all files in the projects are also
-            closed. To keep them open, deselect the \uicontrol Tools >
+            closed. To keep them open, deselect the \uicontrol Edit >
-            \uicontrol Options > \uicontrol {Build & Run} > \uicontrol General
+            \uicontrol Preferences > \uicontrol {Build & Run} > \uicontrol General
             > \uicontrol {Close source files along with project} check box.
     \endlist
 

doc/qtcreator/src/user-interface/creator-ui.qdoc

@@ -111,7 +111,7 @@
     \section1 For \macos Users
 
     \QC uses standard names and locations for standard features, such as
-    \e options or \e preferences. In this manual, the names and locations on
+    \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:
@@ -121,7 +121,7 @@
             \li For
             \li Look In
         \row
-            \li \uicontrol Tools > \uicontrol Options
+            \li \uicontrol Edit > \uicontrol Preferences
             \li \uicontrol {\QC} > \uicontrol Preferences
         \row
             \li \uicontrol Help > \uicontrol {About Plugins}
@@ -141,7 +141,7 @@
 
     To toggle the visibility of these menu items:
     \list 1
-      \li Go to \uicontrol Tools > \uicontrol Options.
+      \li Go to \uicontrol Edit > \uicontrol Preferences.
       \li On the \uicontrol Environment tab, select
       \uicontrol{Qt Design Studio Configuration}.
       \li Clear the checkbox for the items that you want to be visible.
@@ -156,7 +156,7 @@
     \section1 Switching UI Themes
 
     Themes enable you to change the appearance of the UI from dark to light,
-    for example. To switch themes, select \uicontrol Tools > \uicontrol Options
+    for example. To switch themes, select \uicontrol Edit > \uicontrol Preferences
     > \uicontrol Environment, and then select a theme in the \uicontrol Theme
     field.
 
@@ -166,7 +166,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 Tools > \uicontrol Options >
+    change the language, select \uicontrol Edit > \uicontrol 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.
@@ -189,7 +189,7 @@
     \endlist
 
     To override the default approach and always enable high-DPI scaling, select
-    \uicontrol Tools > \uicontrol Options > \uicontrol Environment >
+    \uicontrol Edit > \uicontrol Preferences > \uicontrol Environment >
     \uicontrol {Enable high DPI scaling}. The changes will take effect after you
     restart \QC.
 
@@ -441,8 +441,8 @@
 
     If the text in the output is not displayed correctly, \QC might
     be using a different codec from the one used by the tools that generate
-    the output. To specify the codec to use, select \uicontrol Tools >
+    the output. To specify the codec to use, select \uicontrol Edit >
-    \uicontrol Options > \uicontrol Environment > \uicontrol Interface, and
+    \uicontrol Preferences > \uicontrol Environment > \uicontrol Interface, and
     then select the codec in the \uicontrol {Text codec for tools} field.
 
     \image qtcreator-options-environment-interface.png "Interface tab in the Environment options"
@@ -540,8 +540,8 @@
     \key Shift+F6.
 
     By default, the \uicontrol Issues view is cleared on a new build. To keep
-    the issues from the previous build rounds, deselect \uicontrol Tools >
+    the issues from the previous build rounds, deselect \uicontrol Edit >
-    \uicontrol Options > \uicontrol {Build & Run} > \uicontrol General >
+    \uicontrol Preferences > \uicontrol {Build & Run} > \uicontrol General >
     \uicontrol {Clear issues list on new build}.
 
     \section1 Search Results
@@ -580,7 +580,7 @@
     running application, and to stop running or debugging.
 
     To specify settings for displaying application output, select
-    \uicontrol Tools > \uicontrol Options > \uicontrol {Build & Run} >
+    \uicontrol Edit > \uicontrol Preferences > \uicontrol {Build & Run} >
     \uicontrol {Application Output}, or click the \inlineimage icons/settings.png
     (\uicontrol {Open Settings Page}) button. You can select whether to open
     \uicontrol{Application Output} on output when running or debugging
@@ -601,7 +601,7 @@
     Select the \uicontrol {Cancel Build} button to cancel the build.
 
     To specify whether to open the \uicontrol {Compile Output} view on output
-    when building applications, select \uicontrol Tools > \uicontrol Options >
+    when building applications, select \uicontrol Edit > \uicontrol Preferences >
     \uicontrol {Build & Run} > \uicontrol {Compile Output}, and then select the
     \uicontrol {Open Compile Output when building} check box.
     In the \uicontrol {Limit output to} field, you can specify the maximum
@@ -651,7 +651,7 @@
 
     \image qtcreator-todo-pane.png
 
-    To add keywords, select \uicontrol Tools > \uicontrol Options >
+    To add keywords, select \uicontrol Edit > \uicontrol Preferences >
     \uicontrol {To-Do} > \uicontrol Add. Set an icon and a line background color
     for the keyword.
 

doc/qtcreator/src/vcs/creator-only/creator-vcs-clearcase.qdoc

@@ -51,7 +51,7 @@
         \li Download \l{http://gnuwin32.sourceforge.net/packages/diffutils.htm}
             {Diffutils} and extract it to a directory in your PATH.
 
-        \li Select \uicontrol Tools > \uicontrol Options >
+        \li Select \uicontrol Edit > \uicontrol Preferences >
             \uicontrol {Version Control} > \uicontrol ClearCase.
 
         \li Select the \uicontrol External radio button. The radio button is
@@ -71,12 +71,12 @@
     \uicontrol ClearCase > \uicontrol {Check Out}. If you check out files in a
     Unified Change Management (UCM) view, they are added to the change set of
     a UCM activity. By default, the activities are automatically assigned names.
-    To disable this functionality, select \uicontrol Tools > \uicontrol Options
+    To disable this functionality, select \uicontrol Edit > \uicontrol Preferences
     > \uicontrol {Version Control} > \uicontrol ClearCase, and then deselect the
     \uicontrol {Automatically assign activity names} check box.
 
-    To automatically check out files when you edit them, select \uicontrol Tools
+    To automatically check out files when you edit them, select \uicontrol Edit
-    > \uicontrol Options > \uicontrol {Version Control} > \uicontrol ClearCase,
+    > \uicontrol Preferences > \uicontrol {Version Control} > \uicontrol ClearCase,
     and then select the \uicontrol {Automatically check out files on edit}
     check box.
 
@@ -91,12 +91,12 @@
     To create a permanent new version of the current file or all files in the
     versioned object base (VOB), select \uicontrol Tools >
     \uicontrol {ClearCase} > \uicontrol {Check In}. To be asked to confirm
-    that you want to check in the files, select \uicontrol Tools >
+    that you want to check in the files, select \uicontrol Edit >
-    \uicontrol Options > \uicontrol {Version Control} > \uicontrol ClearCase,
+    \uicontrol Preferences > \uicontrol {Version Control} > \uicontrol ClearCase,
     and then select the \uicontrol {Prompt on check-in} check box.
 
     By default, you are asked to enter a comment when checking files out or in.
-    To suppress this prompt, select \uicontrol Tools > \uicontrol Options >
+    To suppress this prompt, select \uicontrol Edit > \uicontrol Preferences >
     \uicontrol {Version Control} > \uicontrol ClearCase, and then select the
     \uicontrol {Do not prompt for comment during checkout or check-in} check
     box.
@@ -107,7 +107,7 @@
     \uicontrol Tools > \uicontrol ClearCase > \uicontrol {Undo Hijack}.
 
     By default, the files in the VOBs are indexed for quick access to their
-    statuses. To disable indexing, select \uicontrol Tools > \uicontrol Options
+    statuses. To disable indexing, select \uicontrol Edit > \uicontrol Preferences
     > \uicontrol {Version Control} > \uicontrol ClearCase, and then select the
     \uicontrol {Disable indexer} check box. To only have some VOBs indexed,
     specify them in the \uicontrol {Index only VOBs} field.

doc/qtcreator/src/vcs/creator-only/creator-vcs-cvs.qdoc

@@ -51,8 +51,8 @@
     To unedit files in the local directory, as well as recursively in all
     subdirectories, select \uicontrol {Unedit Repository}.
 
-    To specify the CVS root directory, select \uicontrol Tools >
+    To specify the CVS root directory, select \uicontrol Edit >
-    \uicontrol Options > \uicontrol {Version Control} > \uicontrol CVS, and then
+    \uicontrol Preferences > \uicontrol {Version Control} > \uicontrol CVS, and then
     specify the path to the directory in the \uicontrol {CVS root} field.
 
     You can specify settings for viewing diff output in the

doc/qtcreator/src/vcs/creator-only/creator-vcs-options.qdocinc

@@ -33,8 +33,8 @@
     repositories. To allow access, make sure that the command line clients can
     be located using the \c{PATH} environment variable. Alternatively, specify
     the path to the command line client executable in the \uicontrol Command
-    field in the version control system specific tab in \uicontrol Tools >
+    field in the version control system specific tab in \uicontrol Edit >
-    \uicontrol Options > \uicontrol {Version Control}.
+    \uicontrol Preferences > \uicontrol {Version Control}.
 
     If authentication is required to access the repository, enter the user
     credentials in the \uicontrol Username and \uicontrol Password fields.
@@ -54,9 +54,8 @@
 
     \section1 Setting Up General Options
 
-    Select \uicontrol{Tools} > \uicontrol{Options} > \uicontrol{Version Control}
+    Select \uicontrol Edit > \uicontrol Preferences > \uicontrol {Version Control}
-    > \uicontrol{General}
+    > \uicontrol General to specify settings for submit messages:
-    to specify settings for submit messages:
 
     \list
         \li \uicontrol{Wrap submit messages at} limits the line length of a

doc/qtcreator/src/vcs/creator-only/creator-vcs-perforce.qdoc

@@ -60,8 +60,8 @@
     \l {Using Common Functions}, you can select \uicontrol Tools >
     \uicontrol Perforce > \uicontrol {Edit File} to open a file for editing
     within the client workspace. By default, files are automatically opened for
-    editing. To disable this feature, select \uicontrol Tools >
+    editing. To disable this feature, select \uicontrol Edit >
-    \uicontrol Options > \uicontrol {Version Control} > \uicontrol Perforce,
+    \uicontrol Preferences > \uicontrol {Version Control} > \uicontrol Perforce,
     and then deselect the \uicontrol {Automatically open files when editing}
     check box.
 
@@ -75,7 +75,7 @@
     \uicontrol Tools > \uicontrol Perforce > \uicontrol Describe.
 
     By default, you are prompted to confirm that you want to submit changes.
-    To suppress the prompt, select \uicontrol Tools > \uicontrol Options >
+    To suppress the prompt, select \uicontrol Edit > \uicontrol Preferences >
     \uicontrol {Version Control} > \uicontrol Perforce, and then deselect the
     \uicontrol {Prompt on submit} check box.
 */

doc/qtcreator/src/vcs/creator-only/creator-vcs-subversion.qdoc

@@ -44,7 +44,7 @@
     for a revision.
 
     By default, you are prompted to confirm that you want to submit changes.
-    To suppress the prompt, select \uicontrol Tools > \uicontrol Options >
+    To suppress the prompt, select \uicontrol Edit > \uicontrol Preferences >
     \uicontrol {Version Control} > \uicontrol Subversion, and then deselect the
     \uicontrol {Prompt on submit} check box.
 

doc/qtcreator/src/vcs/creator-vcs-git.qdoc

@@ -62,7 +62,7 @@
     installation directory, and therefore, the authorization fails.
 
     You can set the \c HOME environment variable from \QC. Select
-    \uicontrol Tools > \uicontrol Options > \uicontrol {Version Control} >
+    \uicontrol Edit > \uicontrol Preferences > \uicontrol {Version Control} >
     \uicontrol Git, and then select the
     \uicontrol {Set "HOME" environment variable} check box. \c HOME is
     set to \c %HOMEDRIVE%%HOMEPATH% when the Git executable is run and
@@ -480,7 +480,7 @@
 
     To pull changes from the remote repository, select \uicontrol Pull. If there
     are locally modified files, you are prompted to stash the changes. Select
-    \uicontrol Tools > \uicontrol Options > \uicontrol {Version Control} >
+    \uicontrol Edit > \uicontrol Preferences > \uicontrol {Version Control} >
     \uicontrol Git and then select the \uicontrol {Pull with rebase} check box
     to perform a rebase operation while pulling.
 
@@ -569,7 +569,7 @@
     To refresh the list of changes, select \uicontrol Refresh.
 
     The \uicontrol Remote field lists the remotes of the current repository that
-    are detected as Gerrit servers. Select \uicontrol Tools > \uicontrol Options
+    are detected as Gerrit servers. Select \uicontrol Edit > \uicontrol Preferences
     > \uicontrol {Version Control} > \uicontrol Gerrit to specify a fallback
     connection to a Gerrit server over SSH. The Gerrit REST interface and the
     \l{https://curl.haxx.se/}{curl} tool are used for HTTP connections.
@@ -594,11 +594,11 @@
     \uicontrol Git > \uicontrol {Git Tools} > \uicontrol Gitk. You can also
     start the tool to view commits in the current document or in the folder that
     contains the current document. To specify arguments for running Gitk, select
-    \uicontrol Tools > \uicontrol Options > \uicontrol {Version Control} >
+    \uicontrol Edit > \uicontrol Preferences > \uicontrol {Version Control} >
     \uicontrol Git.
 
     To use some other application for viewing Git history, such as GitX or
-    QGit viewer, select \uicontrol Tools > \uicontrol Options >
+    QGit viewer, select \uicontrol Edit > \uicontrol Preferences >
     \uicontrol {Version Control} > \uicontrol Git and specify the path to the
     application executable in the \uicontrol {Command} field. To start the
     application, select \uicontrol Tools > \uicontrol Git

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

@@ -93,7 +93,7 @@
     To configure \QC for building Qt apps for the web:
 
     \list 1
-        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Devices >
+        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Devices >
             \uicontrol WebAssembly.
         \li In the \uicontrol {Emscripten SDK path} field, enter the root
             directory where \c emsdk is installed.
@@ -101,7 +101,7 @@
             if the \c emsdk is supported by the Qt for WebAssembly version that
             you will use for developing the application.
             \image qtcreator-webassembly-options.png "Qt for WebAssembly device options"
-        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Kits.
+        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits.
             \image qtcreator-kit-webassembly.png "Qt for WebAssembly kit"
         \li In the \uicontrol Compiler group, \uicontrol {Emscripten Compiler}
             should have been automatically detected for both C++ and C. If not,
@@ -114,7 +114,7 @@
     to \QC. To add kits:
 
     \list 1
-        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Kits >
+        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits >
             \uicontrol Add.
         \li In the \uicontrol Name field, specify a name for the kit.
         \li In the \uicontrol {Device type} field, select

doc/qtcreator/src/widgets/qtdesigner-overview.qdoc

@@ -73,7 +73,7 @@
 
     \list
 
-        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Designer.
+        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Designer.
 
         \li Specify settins for generating classes and code in \uicontrol {Class
             Generation}.
@@ -101,7 +101,7 @@
 
     \list 1
 
-        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Designer.
+        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Designer.
 
         \li Select the \uicontrol{Print/Preview Configuration} check box.
 

doc/qtcreatordev/src/actionmanager.qdoc

@@ -28,7 +28,7 @@
     \title The Action Manager and Commands
 
     \QC provides a central options page for managing shortcuts for actions in
-    \uicontrol Tools > \uicontrol Options > \uicontrol Environment >
+    \uicontrol Edit > \uicontrol Preferences > \uicontrol Environment >
     \uicontrol Keyboard. Plugins must tell \QC about the actions they provide,
     so they can appear in the options. Also some actions, like \uicontrol Edit >
     \uicontrol Undo, need to be dispatched to different plugins depending on the

doc/qtcreatordev/src/common-extension-tasks.qdoc

@@ -83,9 +83,9 @@
             \li \l{Core::INavigationWidgetFactory}
 
         \row
-            \li Add an options page to the \uicontrol Options dialog.
+            \li Add a page to the \uicontrol Preferences dialog.
             \li Add a new page to existing or new category in
-                \uicontrol Tools > \uicontrol Options.
+                \uicontrol Edit > \uicontrol Preferences.
             \li \l{Core::IOptionsPage}
 
         \row

doc/qtcreatordev/src/qtcreator-dev.qdoc

@@ -199,7 +199,7 @@
     Usually, you can use the external tool specification files to start the
     tool. If starting the tool and handling its output require more complex
     logic, you can add a menu item to \QC with a plugin. If you need a way to
-    configure the tool in \QC, you can add an \uicontrol Options page for it.
+    configure the tool in \QC, you can add an options page for it.
 
     \list
         \li \l{https://doc.qt.io/qtcreator/creator-editor-external.html}{Using External Tools}

doc/qtdesignstudio/src/components/qtquick-text.qdoc

@@ -88,7 +88,7 @@
     \image qml-translate.png "Text marked for translation"
 
     If you use text IDs instead of plain text, change the default call to
-    \c qsTrId(). Select \uicontrol Tools > \uicontrol Options >
+    \c qsTrId(). Select \uicontrol Edit > \uicontrol Preferences >
     \uicontrol {Qt Quick} > \uicontrol {Qt Quick Designer}, and then select the
     \uicontrol {qsTrId()} radio button in the \uicontrol Internationalization
     group. For more information about text ID based translations, see

doc/qtdesignstudio/src/overviews/studio-crashpad.qdoc

@@ -43,8 +43,8 @@
     of the collected data, see \l {https://sentry.io/security/}
     {Security & Compliance} by Sentry.
 
-    To enable sending crash reports, select \uicontrol Tools > \uicontrol
+    To enable sending crash reports, select \uicontrol Edit >
-    Options > \uicontrol Environment > \uicontrol System
+    \uicontrol Preferences > \uicontrol Environment > \uicontrol System
     (\uicontrol {Qt Design Studio} > \uicontrol Preferences > \uicontrol
     Environment > \uicontrol System on \macos), and then select
     \uicontrol {Enable crash reporting}.

doc/qtdesignstudio/src/overviews/studio-user-feedback.qdoc

@@ -42,10 +42,10 @@
 
     For the pop-up survey to appear, you must enable collecting statistics, and
     also allow collecting \uicontrol {4 - Detailed usage statistics} in
-    \uicontrol Tools > \uicontrol Options >  \uicontrol Telemetry >
+    \uicontrol Edit > \uicontrol Preferences >  \uicontrol Telemetry >
     \uicontrol {Usage Statistics} > \uicontrol {Telemetry mode}.
     You can review the submitted user feedback in
-    \uicontrol Tools > \uicontrol Options > \uicontrol Telemetry >
+    \uicontrol Edit > \uicontrol Preferences > \uicontrol Telemetry >
     \uicontrol {Usage Statistics} > \uicontrol {Collected Data} by selecting
     \uicontrol {Qt Quick Designer Usage of views and actions} in
     \uicontrol {Data sources}.

doc/qtdesignstudio/src/prototyping/qtquick-live-preview-android.qdoc

@@ -104,7 +104,7 @@
     You need to install Android SDK packages in \QDS:
     \list 1
       \li Run \QDS.
-      \li Go to \uicontrol Tools > \uicontrol Options > \uicontrol{Devices}.
+      \li Go to \uicontrol Edit > \uicontrol Preferences > \uicontrol{Devices}.
       \li Select \uicontrol Yes on the \uicontrol{Missing Android SDK Packages} dialog.
       \image qtds-options-dialog-missing-packages.png
       \li Select \uicontrol OK on the \uicontrol{Android SDK Changes} dialog.
@@ -117,7 +117,7 @@
     have stopped working, try to restart \QDS and run the installation again.
 
     After completing these steps, you should no longer have any errors on the
-    \uicontrol Tools > \uicontrol Options > \uicontrol Devices page.
+    \uicontrol Edit > \uicontrol Preferences > \uicontrol Devices page.
     \image qtds-options-accept-licenses.png
 
     \section2 Create Android Virtual Devices
@@ -140,7 +140,7 @@
 
     To create an AVD in \QDS:
     \list 1
-      \li Go to \uicontrol Tools > \uicontrol Options.
+      \li Go to \uicontrol Edit > \uicontrol Preferences.
       \li On the \uicontrol Devices tab, select \uicontrol Add and follow the wizard to finalize
       the creation. If there is no entry for \e{Android Device} in the
      \uicontrol{Available device types} list, try restarting \QDS.
@@ -176,7 +176,7 @@
       \image toolbar-show-live-preview.png
       \li Select \uicontrol Build > \uicontrol{QML Preview}.
       \note The \uicontrol Build menu option is not visible by default. To show
-      it, go to \uicontrol Tools > \uicontrol Options > \uicontrol Environment
+      it, go to \uicontrol Edit > \uicontrol Preferences > \uicontrol Environment
       > \uicontrol {Qt Design Studio Configuration}.
       \image menu-build-qml-preview.png
     \endlist

doc/qtdesignstudio/src/views/qtquick-form-editor.qdoc

@@ -179,7 +179,7 @@
     Only one snapping button can be selected at the time. Selecting
     one snapping button automatically deselects the others.
 
-    Choose \uicontrol Tools > \uicontrol Options > \uicontrol {Qt Quick} >
+    Choose \uicontrol Edit > \uicontrol Preferences > \uicontrol {Qt Quick} >
     \uicontrol {Qt Quick Designer} to specify settings for snapping. In the
     \uicontrol {Parent component padding} field, specify the distance in
     pixels between the parent and the snapping lines. In the
@@ -220,14 +220,14 @@
 
     \image qmldesigner-preview-size.png "Component width and height"
 
-    To set the initial size of the root component, select \uicontrol Tools >
+    To set the initial size of the root component, select \uicontrol Edit >
-    \uicontrol Options > \uicontrol {Qt Quick} > \uicontrol {Qt Quick Designer}
+    \uicontrol Preferences > \uicontrol {Qt Quick} > \uicontrol {Qt Quick Designer}
     and specify the component width and height in the
     \uicontrol {Root Component Init Size} group.
 
     \section1 Specifying Canvas Size
 
-    To change the canvas size, select \uicontrol Tools > \uicontrol Options >
+    To change the canvas size, select \uicontrol Edit > \uicontrol Preferences >
     \uicontrol {Qt Quick} > \uicontrol {Qt Quick Designer} and
     specify the canvas width and height in the \uicontrol Canvas group.
 

scripts/deployqt.py

@@ -238,7 +238,7 @@ def deploy_clang(install_dir, llvm_install_dir, chrpath_bin):
         clanglibdirtarget = os.path.join(install_dir, 'bin', 'clang', 'lib')
         if not os.path.exists(clanglibdirtarget):
             os.makedirs(clanglibdirtarget)
-        for binary in ['clangd', 'clang-tidy', 'clazy-standalone']:
+        for binary in ['clangd', 'clang-tidy', 'clazy-standalone', 'clang-format']:
             binary_filepath = os.path.join(llvm_install_dir, 'bin', binary + '.exe')
             if os.path.exists(binary_filepath):
                 deployinfo.append((binary_filepath, clangbindirtarget))
@@ -248,7 +248,7 @@ def deploy_clang(install_dir, llvm_install_dir, chrpath_bin):
         clangbinary_targetdir = os.path.join(install_dir, 'libexec', 'qtcreator', 'clang', 'bin')
         if not os.path.exists(clangbinary_targetdir):
             os.makedirs(clangbinary_targetdir)
-        for binary in ['clangd', 'clang-tidy', 'clazy-standalone']:
+        for binary in ['clangd', 'clang-tidy', 'clazy-standalone', 'clang-format']:
             binary_filepath = os.path.join(llvm_install_dir, 'bin', binary)
             if os.path.exists(binary_filepath):
                 deployinfo.append((binary_filepath, clangbinary_targetdir))