diff --git a/doc/qtcreator/src/editors/creator-editors-options.qdoc b/doc/qtcreator/src/editors/creator-editors-options.qdoc index e74f3d1d31a..027b41bdef6 100644 --- a/doc/qtcreator/src/editors/creator-editors-options.qdoc +++ b/doc/qtcreator/src/editors/creator-editors-options.qdoc @@ -31,7 +31,7 @@ \image qtcreator-editor-settings.png "Editor settings" \if defined(qtcreator) - For more information, see \l{Specifying Editor Settings}. + For more information, see \l{Specify editor settings}. \endif You can also specify indentation settings separately for C++ and QML files diff --git a/doc/qtcreator/src/editors/creator-only/creator-coding-edit-mode.qdoc b/doc/qtcreator/src/editors/creator-only/creator-coding-edit-mode.qdoc index c17613f38f5..6602548e7b1 100644 --- a/doc/qtcreator/src/editors/creator-only/creator-coding-edit-mode.qdoc +++ b/doc/qtcreator/src/editors/creator-only/creator-coding-edit-mode.qdoc @@ -103,7 +103,7 @@ To set the line endings to use for a project, select \uicontrol Projects > \uicontrol {Project Settings} > \uicontrol Editor. - For more information, see \l {Specifying Editor Settings}. + For more information, see \l {Specify editor settings}. \section2 Managing Language Servers diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-editor.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-editor.qdoc index 3f146ca9c01..fc35f3391e8 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-editor.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-editor.qdoc @@ -1,4 +1,4 @@ -// Copyright (C) 2022 The Qt Company Ltd. +// Copyright (C) 2023 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only // ********************************************************************** @@ -8,21 +8,17 @@ // ********************************************************************** /*! - \previouspage creator-run-settings.html \page creator-editor-settings.html - \nextpage creator-code-style-settings.html + \previouspage creator-how-tos.html - \title Specifying Editor Settings + \ingroup creator-how-to-projects + + \title Specify editor settings \QC uses the \l{Editing MIME Types}{MIME type} of the file to determine which mode and editor to use for opening the file. For example, \QC opens .txt files in \uicontrol Edit mode in the text editor. - 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 Edit > - \uicontrol Preferences > \uicontrol {Text Editor} > \uicontrol Behavior. - To configure the text editor behavior for the current project: \list 1 @@ -40,24 +36,8 @@ Click \uicontrol {Restore Global} to revert to the global settings. - For more information about the settings, see: - - \list - - \li \l{Indenting Text or Code} - - \li \l{File Encoding} - - \li \l{Selecting Line Ending Style} - - \li \l{Moving to Symbol Definition or Declaration} - - \li \l{Configuring Fonts} - - \li \l{Highlighting and Folding Blocks} - - \li \l{View function tooltips} - - \endlist - + \sa {Configuring Fonts}, {File Encoding}, + {Moving to Symbol Definition or Declaration}, {Indenting Text or Code}, + {Highlighting and Folding Blocks}, {Selecting Line Ending Style}, + {View function tooltips} */ diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-overview.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-overview.qdoc index 82bad206b69..37e7cd0ab25 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-overview.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-overview.qdoc @@ -33,18 +33,19 @@ \section1 Overriding Global Preferences - You can override the following global preferences for each project: + In \uicontrol {Project Settings}, you can override global preferences for + the project: \list - \li \l{Specifying Editor Settings}{Editor} - \li \l{Specifying Code Style}{Code Style} - \li \l{Specifying Dependencies}{Dependencies} - \li \l{Specifying Environment Settings}{Environment} - \li \l{Using Custom Output Parsers}{Custom Output Parsers} - \li \l{Applying Refactoring Actions}{Quick Fixes} - \li \l{Using Clang Tools}{Clang Tools} - \li \l{To-Do Entries}{To-Do} (experimental) \li \l{Parsing C++ Files with the Clang Code Model}{Clangd} + \li \l{Using Clang Tools}{Clang Tools} + \li \l{Specifying Code Style}{Code Style} + \li \l{Using Custom Output Parsers}{Custom Output Parsers} + \li \l{Specifying Dependencies}{Dependencies} + \li \l{Specify editor settings}{Editor} + \li \l{Specifying Environment Settings}{Environment} + \li \l{Applying Refactoring Actions}{Quick Fixes} + \li \l{To-Do Entries}{To-Do} (experimental) \endlist If you have multiple projects open in \QC, select the project to configure diff --git a/doc/qtcreator/src/qtcreator-toc.qdoc b/doc/qtcreator/src/qtcreator-toc.qdoc index 9d25af66dad..c5a20c5cd4e 100644 --- a/doc/qtcreator/src/qtcreator-toc.qdoc +++ b/doc/qtcreator/src/qtcreator-toc.qdoc @@ -43,7 +43,6 @@ \li \l{Conan Build Configuration} \endlist \li \l{Specifying Run Settings} - \li \l{Specifying Editor Settings} \li \l{Specifying Code Style} \li \l{Specifying Dependencies} \li \l{Specifying Environment Settings} @@ -224,6 +223,7 @@ \li \l {Develop Qt for Python applications} \li \l {Open projects} \li \l {Select the build system} + \li \l {Specify editor settings} \li \l {Specify project contents} \li \l {Use project wizards} \endlist