feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'gerrit/12.0'

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs

Change-Id: Ide00b6dd5b44d637b18892c663035e736de03485
This commit is contained in:
Eike Ziller
2023-11-13 10:22:12 +01:00
parent 845337436c eb9c2da726
commit 104959f7f7
14 changed files with 26 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/qtcreator/src/editors/creator-locator.qdoc
View File

@@ -170,7 +170,7 @@
\section2 Opening Sessions from Locator
You can use the filter that triggers menu commands to open
\l{Managing Sessions}{sessions}. Enter
\l{Manage sessions}{sessions}. Enter
\c {t yoursess} or \c {t sess yoursess} to trigger \uicontrol File >
\uicontrol Sessions > \e <session_name>.

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

@@ -149,7 +149,7 @@
\image qtcreator-toggle-progress-bar.webp {Toggle Progress Details button}
By default, \QC runs one clangd process per project. If you have created
\l{Managing Sessions}{sessions} that have related projects, you can
\l{Manage sessions}{sessions} that have related projects, you can
specify that the projects in the session should be managed by a single
clangd process.

8
doc/qtcreator/src/howto/creator-only/creator-cli.qdoc
View File

@@ -197,15 +197,13 @@
\li -lastsession
\li ProjectExplorer plugin: load the last session when \QC starts.
Open the projects and files that were open when you last exited
\QC. For more information about managing sessions, see
\l{Managing Sessions}.
\QC.
\row
\li <session>
\li ProjectExplorer plugin: load the given session when \QC starts.
Open the projects and files that were open when you last exited
\QC. For more information about managing sessions, see
\l{Managing Sessions}.
\QC.
\endtable
@@ -225,5 +223,5 @@
You can also switch to a dark theme to customize the appearance of widgets,
colors, and icons without using stylesheets.
\sa {Run Qt Creator from the command line}
\sa {Run Qt Creator from the command line}, {Manage sessions}
*/

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

@@ -173,7 +173,7 @@
To open a project that is located in a particular directory, you can
pass on the directory name as a command-line argument. \QC looks for
a \l{Managing Sessions}{session} that matches the directory name and
a \l{Manage sessions}{session} that matches the directory name and
loads it. Or it looks for a project file in the directory and opens it.
For example, on Windows:

15
doc/qtcreator/src/howto/creator-sessions.qdoc
View File

@@ -13,11 +13,13 @@
\previouspage creator-project-managing-workspaces.html
\nextpage creator-keyboard-shortcuts.html
\else
\previouspage creator-sharing-project-settings.html
\nextpage creator-design-mode.html
\previouspage creator-how-tos.html
\endif
\title Managing Sessions
\ingroup creator-how-to-use
\ingroup studio-how-to
\title Manage sessions
When you exit \QC, it stores a snapshot of your current workspace as a
\e session. To restore the session automatically when you start \QC,
@@ -61,6 +63,8 @@
To save a session under a new name, select \uicontrol Clone.
\section1 Create new sessions
To create a new session:
\list 1
@@ -76,9 +80,12 @@
\endlist
\section1 Open sessions
To switch between sessions, select \uicontrol {Open}.
\if defined(qtcreator)
The \uicontrol Projects tab in the \uicontrol Welcome mode lists existing
sessions. To open a session, select it or press
\key Ctrl+Alt+<number>, where \e <number> is the number of the session to
@@ -96,7 +103,7 @@
When you start \QC from the command line, you can give the name of
a session as an argument and \QC will start with this session.
For more information, see \l{Command-Line Options}.
\sa {Command-Line Options}, {Searching with the Locator}
\endif
*/

14
doc/qtcreator/src/projects/creator-only/creator-projects-overview.qdoc
View File

@@ -16,10 +16,6 @@
\image front-projects.png
You can share projects with other designers and developers across different
development platforms with a common tool for design, development, and
debugging.
\list
\li \l{Creating Projects}
@@ -42,14 +38,8 @@
configurations for \QC and your projects. You can modify
the settings in the \uicontrol Projects mode.
\li \l{Managing Sessions}
Sessions store items such as open files, breakpoints, and evaluated
expressions, which you do not typically want to share across
platforms.
\endlist
\sa {Build Systems}
\sa {Manage Projects}{How To: Manage Projects}, {Manage sessions},
{Build Systems}
*/

2
doc/qtcreator/src/projects/creator-only/creator-projects-settings-dependencies.qdoc
View File

@@ -46,6 +46,6 @@
\note You cannot use this view to specify subprojects for projects.
\sa {Add subprojects to projects}, {Managing Sessions}
\sa {Add subprojects to projects}, {Manage sessions}
*/

1
doc/qtcreator/src/qtcreator-toc.qdoc
View File

@@ -42,7 +42,6 @@
\li \l{Using Custom Output Parsers}
\li \l{Sharing Project Settings}
\endlist
\li \l{Managing Sessions}
\endlist
\li \l{Designing User Interfaces}
\list

1
doc/qtcreator/src/qtcreator.qdoc
View File

@@ -53,7 +53,6 @@
\li \l{Creating Projects}
\li \l{Version Control Systems}
\li \l{Configuring Projects}
\li \l{Managing Sessions}
\endlist
\li \b {\l{Designing User Interfaces}}
\list

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

@@ -19,7 +19,7 @@
\if defined(qtcreator)
The project tree has a list of all projects open in the current
\l{Managing Sessions}{session}. For each project, the tree visualizes
\l{Manage 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.

2
doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc
View File

@@ -36,7 +36,7 @@
\li \l{Qt Insight}
\endlist
\li \l{Managing Workspaces}
\li \l{Managing Sessions}
\li \l{Manage sessions}
\li \l{Keyboard Shortcuts}
\endlist
\li \l{Creating Projects}

1
src/plugins/coreplugin/dialogs/settingsdialog.cpp
View File

@@ -478,6 +478,7 @@ SettingsDialog::SettingsDialog(QWidget *parent)
m_model.setPages(m_pages, IOptionsPageProvider::allOptionsPagesProviders());
m_proxyModel.setSortLocaleAware(true);
m_proxyModel.setSourceModel(&m_model);
m_proxyModel.setFilterCaseSensitivity(Qt::CaseInsensitive);
m_categoryList->setIconSize(QSize(categoryIconSize, categoryIconSize));

2
src/plugins/cppeditor/cppcodemodelsettingspage.cpp
View File

@@ -294,7 +294,7 @@ ClangdSettingsWidget::ClangdSettingsWidget(const ClangdSettings::Data &settingsD
d->autoIncludeHeadersCheckBox.setChecked(settings.autoIncludeHeaders());
d->autoIncludeHeadersCheckBox.setToolTip(autoIncludeToolTip);
d->threadLimitSpinBox.setValue(settings.workerThreadLimit());
d->threadLimitSpinBox.setSpecialValueText("Automatic");
d->threadLimitSpinBox.setSpecialValueText(Tr::tr("Automatic"));
d->threadLimitSpinBox.setToolTip(workerThreadsToolTip);
d->documentUpdateThreshold.setMinimum(50);
d->documentUpdateThreshold.setMaximum(10000);

4
src/plugins/cppeditor/cppfilesettingspage.cpp
View File

@@ -302,7 +302,7 @@ CppFileSettingsWidget::CppFileSettingsWidget(CppFileSettings *settings)
Column {
Group {
title("Headers"),
title(Tr::tr("Headers")),
Form {
Tr::tr("&Suffix:"), m_headerSuffixComboBox, st, br,
Tr::tr("S&earch paths:"), m_headerSearchPathsEdit, br,
@@ -311,7 +311,7 @@ CppFileSettingsWidget::CppFileSettingsWidget(CppFileSettings *settings)
}
},
Group {
title("Sources"),
title(Tr::tr("Sources")),
Form {
Tr::tr("S&uffix:"), m_sourceSuffixComboBox, st, br,
Tr::tr("Se&arch paths:"), m_sourceSearchPathsEdit, br,