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

bigger conflicts resolved at:
  src/plugins/qmldesigner/CMakeLists.txt
  src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp

Change-Id: I08e2a109d8e37cbd77225129854e9e633725bfc7
This commit is contained in:
Tim Jenßen
2023-03-26 15:58:49 +02:00
8349 changed files with 128327 additions and 169799 deletions

View File

@@ -11,6 +11,11 @@
If you cannot see a file in the \l Projects view, switch to the
\uicontrol {File System} view, which shows all the files in the file system.
\note Usually, \l{Searching with the Locator}{searching with the locator}
is the fastest way to find a particular project, file, class, or function,
or almost anything else in your project. Use the \e {file system (f)} filter
to open files from anywhere in the file system.
\if defined(qtdesignstudio)
The following image displays the \uicontrol {File System} view in the
\uicontrol Design mode:
@@ -53,7 +58,7 @@
\li Open a project located in the selected directory.
\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
that has the file. To specify the terminal to use on Linux and
\macos, select \uicontrol Edit > \uicontrol Preferences >
\uicontrol Environment > \uicontrol System.
\li Search from the selected directory.
@@ -83,7 +88,7 @@
\image qtcreator-filesystem-view.webp "File System view in the sidebar"
\else
The toolbar in the \uicontrol {File System} view contains additional
The toolbar in the \uicontrol {File System} view has additional
options.
\endif

View File

@@ -13,11 +13,15 @@
\title Projects
The \uicontrol Projects view displays projects in a project tree.
The project tree contains a list of all projects open in the current
The project tree has a list of all projects open in the current
\l{Managing Sessions}{session}. For each project, the tree visualizes
the build system structure of the project and lists all files that
are part of the project.
\note Usually, \l{Searching with the Locator}{searching with the locator}
is the fastest way to find a particular project, file, class, or function,
or almost anything else in your project.
\if defined(qtdesignstudio)
The following image displays the \uicontrol Projects view in the
\uicontrol Design mode:
@@ -36,7 +40,7 @@
source files open in the code editor. Use the \l{Selecting Modes}
{mode selector} to open the current file in another editor.
\li To bring up a \l{Projects View Context Menu}{context menu}
containing the actions most commonly needed, right-click an
that has the actions most commonly needed, right-click an
item in the project tree. For example, through the menu of
the project root directory you can, among other actions, run
and close the project.
@@ -49,7 +53,7 @@
\section1 Projects View Context Menu
The \uicontrol Projects view contains context menus for managing projects,
The \uicontrol Projects view has context menus for managing projects,
subprojects, folders, and files. Use the following functions to manage
projects and subprojects:
@@ -64,7 +68,8 @@
\endif
\li Rename or remove existing files. If you change the base name of a
file, \QC displays a list of other files with the same base name
and offers to rename them as well.
and offers to rename them as well. If you rename a UI file (.ui),
\QC also changes corresponding include statements accordingly.
\if defined(qtcreator)
\li Remove existing directories from \l{Setting Up a Generic Project}
{generic projects}.
@@ -72,7 +77,9 @@
\li Add libraries. For more information, see
\l{Adding Libraries to Projects}.
\li Add and remove subprojects.
\li Find unused functions.
\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 Edit >
@@ -97,12 +104,12 @@
\if defined(qtdesignstudio)
In the \uicontrol Edit and \uicontrol Debug mode, the
\l{Working with Sidebars}{sidebar} contains the \uicontrol Projects
\l{Working with Sidebars}{sidebar} has the \uicontrol Projects
view. It has a toolbar with additional options.
\image qtcreator-projects-view-edit.png "Projects view in the sidebar"
\else
The toolbar in the \uicontrol Projects view contains additional options.
The toolbar in the \uicontrol Projects view has additional options.
\endif
@@ -117,7 +124,7 @@
\li \uicontrol {Hide Disabled Files} hides the source files that you
have not enabled for the current target,
\li \uicontrol {Hide Empty Directories} hides directories that do not
contain any files.
have any files.
\li \uicontrol {Show Source and Header Groups} shows source and header
files grouped together in the view, regardless of their location in
the file system.

View File

@@ -50,17 +50,20 @@
\endif
\if defined(qtcreator)
Use the \l{Selecting Modes}{mode selector} (1) to change to another \QC mode.
Do you want to perform a particular task, such as designing the UI,
writing code, or debugging the application? Select the appropriate mode in
the \l{Selecting Modes}{mode selector} (1).
Use the kit selector (2) to select the \l{glossary-buildandrun-kit}{kit} for
running (3), debugging (4), or building (5) the application. The task bar (7)
Are you ready to build the application for particular hardware or (5)
run (3) or debug (4) it on a device? Use the kit selector (2) to select
the appropriate \l{glossary-buildandrun-kit}{kit}. The task bar (7)
displays output from these actions.
Use the \l{Searching with the Locator}{locator} (6) to browse through
projects, files, classes, functions, documentation, and file systems.
Are you looking for a particular project, file, class, or function?
Start typing its name in the \l{Searching with the Locator}{locator} (6).
For a quick tour of the user interface that takes you to the locations of
these controls, select \uicontrol Help > \uicontrol {UI Tour}.
To see where the above controls are in the user interface, select
\uicontrol Help > \uicontrol {UI Tour}.
The following sections describe some \QC controls in more detail:
@@ -116,7 +119,7 @@
\section1 Customizing the Menu
By default, top-level menu items \uicontrol Build, \uicontrol Debug, and
\uicontrol Analyze are not visible. These menu items contain options for
\uicontrol Analyze are not visible. These menu items have options for
advanced functionality.
To toggle the visibility of these menu items:
@@ -463,7 +466,7 @@
\section1 Issues
\uicontrol{Issues} provides lists of following types of issues:
\uicontrol{Issues} lists the following types of issues:
\list
@@ -588,7 +591,7 @@
\section1 Compile Output
\uicontrol{Compile Output} provides all output from the compiler.
\uicontrol{Compile Output} shows all output from the compiler.
The \uicontrol{Compile Output} is a more detailed version of information
displayed in \l Issues.

View File

@@ -22,6 +22,10 @@
{mode} you are working in. Only views that are relevant to a mode are
available in it.
\note Usually, \l{Searching with the Locator}{searching with the locator}
is the fastest way to find a particular project, file, class, or function,
or almost anything else in your project.
Manage projects and files in the following views:
\list
@@ -60,7 +64,7 @@
The following sections describe the additional options in a particular view.
In some views, right-clicking opens a context menu that contains functions
In some views, right-clicking opens a context menu that has functions
for managing the objects listed in the view.
\section1 Viewing Defined Types and Symbols
@@ -98,6 +102,21 @@
To visit all parts of a namespace, double-click on the namespace item
multiple times.
\section1 Viewing Call Hierarchy
The \uicontrol {Call Hierarchy} view shows information about incoming and
outgoing function calls from a \l{Using Language Servers}{language server}.
Place the cursor on a function definition in the code editor to see lists
of functions that call it and the functions it calls. This works recursively,
so you can also see the caller of the caller. However, Clangd only lists
incoming calls.
Select the \inlineimage icons/languageclient.png
button on the \l{Managing Language Servers}{editor toolbar}, and then select
\uicontrol {Restart} to collect call hierarchy information for the function.
\image qtcreator-call-hierarchy-view.png {Call Hierarchy view}
\section1 Viewing Type Hierarchy
To view the base classes and derived classes of a class, right-click the