diff --git a/.gitignore b/.gitignore
index bb073b45dc2..6cbeb2503d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,6 +40,7 @@ ui_*.h
wrapper.bat
wrapper.sh
debug_toolchain.cmake
+CMakeUserPresets.json
# qtcreator generated files
*.creator.user*
diff --git a/CMakePresets.json b/CMakePresets.json
index b4b859933cd..0e4b60e22b7 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -5,6 +5,7 @@
"name": "cmake-plugin-minimal",
"displayName": "CMake, C++, Git, Debug minimal Build",
"generator": "Ninja",
+ "hidden" : true,
"cacheVariables": {
"BUILD_PLUGINS": "Core;Designer;DiffEditor;TextEditor;ProjectExplorer;CppEditor;CodePaster;Docker;Git;Help;QmakeProjectManager;CMakeProjectManager;ClangCodeModel;ClangTools;ClangFormat;Debugger;QtSupport;ResourceEditor;VcsBase;Welcome;LanguageClient;RemoteLinux",
"BUILD_EXECUTABLES": "QtCreator;qtcreator_ctrlc_stub;qtcreator_process_stub;win64interrupt;qtcreator_processlauncher",
diff --git a/README.md b/README.md
index 151be8c678c..4bb9109cab0 100644
--- a/README.md
+++ b/README.md
@@ -164,6 +164,44 @@ Thus, if you want to work on Qt Creator using Qt Creator, you need a separate
installation of it. We recommend using a separate, release-built version of Qt
Creator to work on a debug-built version of Qt Creator.
+Alternatively, take the following template of `CMakeUserPresets.json` for
+reference. Write your own configurePreset inheriting `cmake-plugin-minimal` in
+`CMakeUserPresets.json` to build with IDEs (such as QtCreator, VSCode,
+CLion...etc) locally:
+
+```json
+{
+ "version": 4,
+ "cmakeMinimumRequired": {
+ "major": 3,
+ "minor": 23,
+ "patch": 0
+ },
+ "configurePresets": [
+ {
+ "name": "custom",
+ "displayName": "custom",
+ "description": "custom",
+ "inherits": "cmake-plugin-minimal",
+ "binaryDir": "${sourceDir}/build/${presetName}",
+ "toolset": {
+ "value": "v142,host=x64",
+ "strategy": "external"
+ },
+ "architecture": {
+ "value": "x64",
+ "strategy": "external"
+ },
+ "cacheVariables": {
+ "CMAKE_CXX_COMPILER": "cl.exe",
+ "CMAKE_C_COMPILER": "cl.exe",
+ "CMAKE_PREFIX_PATH": "c:/Qt/6.2.4/msvc2019_64"
+ }
+ }
+ ]
+}
+```
+
### Options
If you do not have Ninja installed and in the `PATH`, remove `-G Ninja` from
diff --git a/cmake/QtCreatorIDEBranding.cmake b/cmake/QtCreatorIDEBranding.cmake
index 8f985e5986b..42ad51bcfd6 100644
--- a/cmake/QtCreatorIDEBranding.cmake
+++ b/cmake/QtCreatorIDEBranding.cmake
@@ -1,6 +1,6 @@
-set(IDE_VERSION "10.0.84") # The IDE version.
-set(IDE_VERSION_COMPAT "10.0.84") # The IDE Compatibility version.
-set(IDE_VERSION_DISPLAY "11.0.0-rc1") # The IDE display version.
+set(IDE_VERSION "11.0.0") # The IDE version.
+set(IDE_VERSION_COMPAT "11.0.0") # The IDE Compatibility version.
+set(IDE_VERSION_DISPLAY "11.0.0") # The IDE display version.
set(IDE_COPYRIGHT_YEAR "2023") # The IDE current copyright year.
set(IDE_SETTINGSVARIANT "QtProject") # The IDE settings variation.
diff --git a/coin/instructions/common_environment.yaml b/coin/instructions/common_environment.yaml
index bafbb59b058..1fec2c793a6 100644
--- a/coin/instructions/common_environment.yaml
+++ b/coin/instructions/common_environment.yaml
@@ -7,7 +7,7 @@ instructions:
variableValue: "RelWithDebInfo"
- type: EnvironmentVariable
variableName: LLVM_BASE_URL
- variableValue: https://master.qt.io/development_releases/prebuilt/libclang/libclang-release_16.0.2-based
+ variableValue: https://ci-files02-hki.ci.qt.io/packages/jenkins/qtcreator_libclang/libclang-release_16.0.2-based
- type: EnvironmentVariable
variableName: QTC_QT_BASE_URL
variableValue: "https://ci-files02-hki.ci.qt.io/packages/jenkins/archive/qt/6.5/6.5.1-released/Qt"
diff --git a/coin/instructions/provision.yaml b/coin/instructions/provision.yaml
index 14e6fb1a239..7b84c6e3baa 100644
--- a/coin/instructions/provision.yaml
+++ b/coin/instructions/provision.yaml
@@ -52,7 +52,7 @@ instructions:
- type: ChangeDirectory
directory: "{{.BuildDir}}/tqtc-qtsdk/packaging_tools"
- type: ExecuteCommand
- command: "python3 -m pipenv run python -u install_qt.py --qt-path {{.BuildDir}}/qt_install_dir --base-url {{.Env.QTC_QT_BASE_URL}} --base-url-postfix={{.Env.QTC_QT_POSTFIX}} --icu7z https://master.qt.io/development_releases/prebuilt/icu/prebuilt/56.1/icu-linux-g++-Rhel7.2-x64.7z {{.Env.QTC_QT_MODULES}}"
+ command: "python3 -m pipenv run python -u install_qt.py --qt-path {{.BuildDir}}/qt_install_dir --base-url {{.Env.QTC_QT_BASE_URL}} --base-url-postfix={{.Env.QTC_QT_POSTFIX}} --icu7z https://ci-files02-hki.ci.qt.io/packages/jenkins/development_releases/prebuilt/icu/prebuilt/56.1/icu-linux-g++-Rhel7.2-x64.7z {{.Env.QTC_QT_MODULES}}"
executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
maxTimeInSeconds: 3600
maxTimeBetweenOutput: 360
@@ -72,7 +72,7 @@ instructions:
property: host.os
equals_value: MacOS
- type: ExecuteCommand
- command: "python -m pipenv run python -u install_qt.py --qt-path {{.BuildDir}}/qt_install_dir --base-url {{.Env.QTC_QT_BASE_URL}} --base-url-postfix={{.Env.QTC_QT_POSTFIX}} --opengl32sw7z https://master.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-64.7z --d3dcompiler7z https://master.qt.io/development_releases/prebuilt/d3dcompiler/msvc2013/d3dcompiler_47-x64.7z --openssl7z https://ci-files02-hki.ci.qt.io/packages/jenkins/openssl/openssl_1.1.1d_prebuild_x64.7z {{.Env.QTC_QT_MODULES}}"
+ command: "python -m pipenv run python -u install_qt.py --qt-path {{.BuildDir}}/qt_install_dir --base-url {{.Env.QTC_QT_BASE_URL}} --base-url-postfix={{.Env.QTC_QT_POSTFIX}} --opengl32sw7z https://ci-files02-hki.ci.qt.io/packages/jenkins/development_releases/prebuilt/llvmpipe/windows/opengl32sw-64.7z --d3dcompiler7z https://ci-files02-hki.ci.qt.io/packages/jenkins/development_releases/prebuilt/d3dcompiler/msvc2013/d3dcompiler_47-x64.7z --openssl7z https://ci-files02-hki.ci.qt.io/packages/jenkins/openssl/openssl_1.1.1d_prebuild_x64.7z {{.Env.QTC_QT_MODULES}}"
executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
maxTimeInSeconds: 3600
maxTimeBetweenOutput: 360
diff --git a/dist/changelog/changes-11.0.0.md b/dist/changelog/changes-11.0.0.md
index ebfc6584875..8b1330dae7a 100644
--- a/dist/changelog/changes-11.0.0.md
+++ b/dist/changelog/changes-11.0.0.md
@@ -26,7 +26,7 @@ What's new?
You can open markdown (.md) files for editing or select `File > New File >
General > Markdown File` to create a new file.
-([Documentation](https://doc-snapshots.qt.io/qtcreator-11.0/creator-markdown-editor.html))
+([Documentation](https://doc.qt.io/qtcreator/creator-markdown-editor.html))
### Terminal
@@ -38,7 +38,7 @@ shells, colors, and fonts.
To use an external terminal, deselect the `Use internal terminal` check box in
`Preferences > Terminal`.
-([Documentation](https://doc-snapshots.qt.io/qtcreator-11.0/creator-output-panes.html#terminal))
+([Documentation](https://doc.qt.io/qtcreator/creator-reference-terminal-view.html))
### Copilot
@@ -48,7 +48,7 @@ suggest code in the `Edit` mode.
To set Copilot preferences, select `Preferences > Copilot`.
-([Documentation](https://doc-snapshots.qt.io/qtcreator-11.0/creator-copilot.html))
+([Documentation](https://doc.qt.io/qtcreator/creator-copilot.html))
### vcpkg
@@ -64,7 +64,7 @@ project.
Edit manifest files in the manifest editor. To search for packages to add to the
file, select the `Search Package` button on the manifest editor toolbar.
-([Documentation](https://doc-snapshots.qt.io/qtcreator-11.0/creator-vcpkg.html))
+([Documentation](https://doc.qt.io/qtcreator/creator-vcpkg.html))
### Axivion
@@ -73,7 +73,7 @@ and link a project to an Axivion project in the project settings, Qt Creator
shows annotations of the latest run in the editors and allows you to view some
details on the issues.
-([Documentation](https://doc-snapshots.qt.io/qtcreator-11.0/creator-axivion.html))
+([Documentation](https://doc.qt.io/qtcreator/creator-axivion.html))
General
-------
@@ -121,10 +121,17 @@ Editing
* Fixed that the locator showed both the declaration and the definition of symbols
([QTCREATORBUG-13894](https://bugreports.qt.io/browse/QTCREATORBUG-13894))
* Fixed the handling of C++20 keywords and concepts
+* Fixed that the automatic Doxygen comment generation did not work when
+ initializer lists `{}` were present
+ ([QTCREATORBUG-29198](https://bugreports.qt.io/browse/QTCREATORBUG-29198))
+* Fixed an issue when matching braces
+ ([QTCREATORBUG-29339](https://bugreports.qt.io/browse/QTCREATORBUG-29339))
* Clangd
* Fixed that the index could be outdated after VCS operations
* Fixed the highlighting of labels
([QTCREATORBUG-27338](https://bugreports.qt.io/browse/QTCREATORBUG-27338))
+ * Fixed freezes when showing tool tips
+ ([QTCREATORBUG-29356](https://bugreports.qt.io/browse/QTCREATORBUG-29356))
* Built-in
* Fixed support for `if`-statements with initializer
([QTCREATORBUG-29182](https://bugreports.qt.io/browse/QTCREATORBUG-29182))
@@ -150,7 +157,10 @@ Editing
* Fixed the completion for Qt Quick Controls
([QTCREATORBUG-28648](https://bugreports.qt.io/browse/QTCREATORBUG-28648))
* Fixed that `qmllint` issues were not shown in the `Issues` view
- ([QTCREATORBUG-28720](https://bugreports.qt.io/browse/QTCREATORBUG-28720))
+ ([QTCREATORBUG-28720](https://bugreports.qt.io/browse/QTCREATORBUG-28720),
+ [QTCREATORBUG-27762](https://bugreports.qt.io/browse/QTCREATORBUG-27762))
+* Fixed a wrong `M16` warning
+ ([QTCREATORBUG-28468](https://bugreports.qt.io/browse/QTCREATORBUG-28468))
### Python
@@ -161,7 +171,12 @@ Editing
* Fixed that too many progress indicators could be created
([QTCREATORBUG-29224](https://bugreports.qt.io/browse/QTCREATORBUG-29224))
- ([Documentation](https://doc-snapshots.qt.io/qtcreator-11.0/creator-python-development.html))
+ ([Documentation](https://doc.qt.io/qtcreator/creator-python-development.html))
+
+### Meson
+
+* Fixed the file targets
+ ([QTCREATORBUG-29349](https://bugreports.qt.io/browse/QTCREATORBUG-29349))
Projects
--------
@@ -187,15 +202,28 @@ Projects
[QTCREATORBUG-28985](https://bugreports.qt.io/browse/QTCREATORBUG-28985),
[QTCREATORBUG-29006](https://bugreports.qt.io/browse/QTCREATORBUG-29006))
([Documentation](https://doc.qt.io/qtcreator/creator-project-cmake.html))
-* Added `Build > Reload CMake Presets` to reload CMake presets after making
- changes to them
- ([Documentation](https://doc-snapshots.qt.io/qtcreator-11.0/creator-build-settings-cmake-presets.html))
* Added support for the `block()` and `endblock()` CMake commands
([CMake documentation](https://cmake.org/cmake/help/latest/command/block.html#command:block))
-* Fixed that CMake Presets were not visible in the `Projects` view
- ([QTCREATORBUG-28966](https://bugreports.qt.io/browse/QTCREATORBUG-28966))
* Fixed issues with detecting a configured Qt version when importing a build
([QTCREATORBUG-29075](https://bugreports.qt.io/browse/QTCREATORBUG-29075))
+* Fixed the project wizards for Qt 6.3 and earlier
+ ([QTCREATORBUG-29067](https://bugreports.qt.io/browse/QTCREATORBUG-29067))
+* Presets
+ * Added `Build > Reload CMake Presets` to reload CMake presets after making
+ changes to them
+ ([Documentation](https://doc.qt.io/qtcreator/creator-build-settings-cmake-presets.html))
+ * Fixed that presets were not visible in the `Projects` view
+ ([QTCREATORBUG-28966](https://bugreports.qt.io/browse/QTCREATORBUG-28966))
+ * Fixed the type handling of the `architecture` and `toolset` fields
+ ([QTCREATORBUG-28693](https://bugreports.qt.io/browse/QTCREATORBUG-28693))
+ * Fixed the setting for QML debugging when creating build configurations
+ ([QTCREATORBUG-29311](https://bugreports.qt.io/browse/QTCREATORBUG-29311))
+
+
+### Qmake
+
+* Fixed an infinite loop when the Qt ABI changed
+ ([QTCREATORBUG-29204](https://bugreports.qt.io/browse/QTCREATORBUG-29204))
### Python
@@ -214,6 +242,10 @@ Debugging
([QTCREATORBUG-28950](https://bugreports.qt.io/browse/QTCREATORBUG-28950))
* Fixed pretty printer for `std::string` for recent `libc++`
([QTCREATORBUG-29230](https://bugreports.qt.io/browse/QTCREATORBUG-29230))
+* Fixed the pretty printers on Fedora 37
+ ([QTCREATORBUG-28659](https://bugreports.qt.io/browse/QTCREATORBUG-28659))
+* Fixed the display of arrays with `Array of 10,000 items`
+ ([QTCREATORBUG-29196](https://bugreports.qt.io/browse/QTCREATORBUG-29196))
### C++
@@ -266,6 +298,11 @@ Platforms
* Fixed an issue with building library targets
([QTCREATORBUG-26980](https://bugreports.qt.io/browse/QTCREATORBUG-26980))
+### iOS
+
+* Improved the bundle ID that the project wizards create
+ ([QTCREATORBUG-29340](https://bugreports.qt.io/browse/QTCREATORBUG-29340))
+
### Remote Linux
* Removed the automatic sourcing of target-side shell profiles
@@ -277,6 +314,14 @@ Platforms
* Fixed issues after deleting the Docker image for a registered Docker device
([QTCREATORBUG-28880](https://bugreports.qt.io/browse/QTCREATORBUG-28880))
+### MCU
+
+* Fixed that errors were shown for valid QML code
+ ([QTCREATORBUG-26655](https://bugreports.qt.io/browse/QTCREATORBUG-26655),
+ [QTCREATORBUG-29155](https://bugreports.qt.io/browse/QTCREATORBUG-29155))
+* Fixed that files were missing from locator and project search
+ ([QTCREATORBUG-29297](https://bugreports.qt.io/browse/QTCREATORBUG-29297))
+
### QNX
* Added `slog2info` as a requirement for devices
@@ -289,6 +334,8 @@ Aleksei German
Alessandro Portale
Alexander Drozdov
Alexander Pershin
+Alexey Edelev
+Alexis Jeandet
Ali Kianian
Alibek Omarov
Amr Essam
@@ -309,8 +356,10 @@ Esa Törmänen
Fabian Kosmale
Filippo Gentile
Friedemann Kleint
+Haowei Hsu
Henning Gruendl
Jaroslaw Kobus
+Joni Poikelin
Jussi Witick
Kai Köhne
Knud Dollereder
@@ -324,6 +373,7 @@ Mats Honkamaa
Miikka Heikkinen
Mitch Curtis
Niels Weber
+Olivier Delaune
Orgad Shaneh
Pranta Dastider
Robert Löhning
@@ -333,8 +383,8 @@ Tasuku Suzuki
Thiago Macieira
Thomas Hartmann
Tim Jenssen
-Tim Jenßen
Ulf Hermann
Vikas Pachdha
+Wladimir Leuschner
Yasser Grimes
Yixue Wang
diff --git a/doc/qtcreator/config/style/qt5-sidebar.html b/doc/qtcreator/config/style/qt5-sidebar.html
index 48111154eb8..9f272e3a7a8 100644
--- a/doc/qtcreator/config/style/qt5-sidebar.html
+++ b/doc/qtcreator/config/style/qt5-sidebar.html
@@ -101,7 +101,8 @@
diff --git a/doc/qtcreator/images/qtcreator-output-panes-taskbar.webp b/doc/qtcreator/images/qtcreator-output-panes-taskbar.webp
index 27b5517cb4a..7801e26ff8f 100644
Binary files a/doc/qtcreator/images/qtcreator-output-panes-taskbar.webp and b/doc/qtcreator/images/qtcreator-output-panes-taskbar.webp differ
diff --git a/doc/qtcreator/images/qtcreator-preferences-application-output.webp b/doc/qtcreator/images/qtcreator-preferences-application-output.webp
new file mode 100644
index 00000000000..7b067e6f7d1
Binary files /dev/null and b/doc/qtcreator/images/qtcreator-preferences-application-output.webp differ
diff --git a/doc/qtcreator/images/qtcreator-preferences-compile-output.webp b/doc/qtcreator/images/qtcreator-preferences-compile-output.webp
new file mode 100644
index 00000000000..2dab7f7333c
Binary files /dev/null and b/doc/qtcreator/images/qtcreator-preferences-compile-output.webp differ
diff --git a/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc b/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc
index abc780fe195..25cc5e944d1 100644
--- a/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc
+++ b/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc
@@ -500,9 +500,9 @@
\endlist
\endlist
- Output from the helper program that processes the data is displayed in
- \l{Viewing Output}{General Messages}.
+ The \uicontrol {General Messages} view shows \l{View output}{output} from the
+ helper program that processes the data.
- Some information is displayed in \l {Application Output} even if the
+ The \l {Application Output} view shows some information even if the
Performance Analyzer displays error messages.
*/
diff --git a/doc/qtcreator/src/editors/creator-coding.qdoc b/doc/qtcreator/src/editors/creator-coding.qdoc
index 77cfc2e000d..ce095492875 100644
--- a/doc/qtcreator/src/editors/creator-coding.qdoc
+++ b/doc/qtcreator/src/editors/creator-coding.qdoc
@@ -26,11 +26,16 @@
\li \l{Writing Code}
+ \if defined(qtdesignstudio)
+ The \l{Code} view offers services, such as semantic highlighting,
+ syntax checking, code completion, code indentation, and in-line
+ error indicators while you are typing.
+ \else
Writing, editing, and navigating in source code are core tasks in
application development. Therefore, the code editor is one of the
key components of \QC. You can use the code editor in the
\uicontrol Edit mode.
-
+ \endif
\li \l{Finding}
Use the incremental and advanced search to search from currently
diff --git a/doc/qtcreator/src/editors/creator-editors-writing-code.qdoc b/doc/qtcreator/src/editors/creator-editors-writing-code.qdoc
index 05853ad0d3d..133f0b7686d 100644
--- a/doc/qtcreator/src/editors/creator-editors-writing-code.qdoc
+++ b/doc/qtcreator/src/editors/creator-editors-writing-code.qdoc
@@ -1,4 +1,4 @@
-// Copyright (C) 2018 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,9 +8,13 @@
// **********************************************************************
/*!
- \previouspage creator-coding.html
\page creator-editor-functions.html
+ \previouspage creator-coding.html
+ \if defined(qtdesignstudio)
+ \nextpage creator-highlighting.html
+ \else
\nextpage creator-coding-navigating.html
+ \endif
\title Writing Code
@@ -19,14 +23,14 @@
in-line error indicators while you are typing.
\list
-
+ \if defined(qtcreator)
\li \l{Working in Edit Mode}
You can use the editor toolbar to navigate between open files
and symbols in use. You can also split the view to work on
several files simultaneously, add bookmarks, and move between
symbol definitions and declarations.
-
+ \endif
\li \l{Semantic Highlighting}
\QC enables you to write well formatted code by highlighting
@@ -75,8 +79,6 @@
keyboard sequence as a macro. You can then play the macro to
repeat the sequence. You can save the latest macro and assign a
keyboard shortcut for running it or run it from the locator.
- \endif
-
\endlist
\section1 Related Topics
@@ -88,7 +90,6 @@
You can use a diff editor to compare two versions of a file and
view the differences side-by-side in the \uicontrol Edit mode.
- \if defined(qtcreator)
\li \l{Parsing C++ Files with the Clang Code Model}
The Clang code model offers some of the same services as the
diff --git a/doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc b/doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc
index 45ca8060925..f9ce09b9551 100644
--- a/doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc
+++ b/doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc
@@ -28,9 +28,8 @@
{locator}, \l{Moving to Symbol Definition or Declaration}
{following symbols}, and so on
- \li Inspecting code by using the \l{Browsing Project Contents}
- {class browser}, the \l{Viewing Defined Types and Symbols}
- {outline}, and so on
+ \li Inspecting code by using the \l{Class View}{class browser}, the
+ \l{Outline}{outline}, and so on
\li Diagnostics
@@ -154,9 +153,8 @@
specify that the projects in the session should be managed by a single
clangd process.
- The document outline in the \l{Viewing Defined Types and Symbols}
- {Outline} view is backed by clangd's document symbol support, which
- makes the results more reliable than before.
+ The document outline in the \l{Outline} view is backed by clangd's document
+ symbol support, which makes the results more reliable than before.
To specify settings for clangd:
diff --git a/doc/qtcreator/src/editors/creator-only/creator-code-pasting.qdoc b/doc/qtcreator/src/editors/creator-only/creator-code-pasting.qdoc
index ce2b4ddd8cb..e12c5e29fdf 100644
--- a/doc/qtcreator/src/editors/creator-only/creator-code-pasting.qdoc
+++ b/doc/qtcreator/src/editors/creator-only/creator-code-pasting.qdoc
@@ -35,7 +35,7 @@
copy the URL of the post on the code pasting service to the
clipboard when you paste a post.
\li Select the \uicontrol {Display General Messages after sending a post}
- check box to display the URL in \l{Viewing Output}{General Messages}
+ check box to display the URL in \l{View output}{General Messages}
when you paste a post.
\endlist
diff --git a/doc/qtcreator/src/editors/creator-coding-edit-mode.qdoc b/doc/qtcreator/src/editors/creator-only/creator-coding-edit-mode.qdoc
similarity index 92%
rename from doc/qtcreator/src/editors/creator-coding-edit-mode.qdoc
rename to doc/qtcreator/src/editors/creator-only/creator-coding-edit-mode.qdoc
index c5042fd7553..c17613f38f5 100644
--- a/doc/qtcreator/src/editors/creator-coding-edit-mode.qdoc
+++ b/doc/qtcreator/src/editors/creator-only/creator-coding-edit-mode.qdoc
@@ -1,33 +1,20 @@
// Copyright (C) 2023 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
-// **********************************************************************
-// NOTE: the sections are not ordered by their logical order to avoid
-// reshuffling the file each time the index order changes (i.e., often).
-// Run the fixnavi.pl script to adjust the links to the index order.
-// **********************************************************************
-
/*!
\previouspage creator-editor-functions.html
\page creator-coding-navigating.html
- \if defined(qtdesignstudio)
- \nextpage creator-views.html
- \else
\nextpage creator-highlighting.html
- \endif
\title Working in Edit Mode
- This section describes how to use the \uicontrol Edit mode. For more
- information about using the sidebar, see \l{Browsing Project Contents}.
+ You can write code in the \uicontrol Edit mode.
\section1 Using the Editor Toolbar
- The editor toolbar is located at the top of the editor view. The editor
- toolbar is context sensitive and shows items relevant to the file currently
- open in the editor.
+ The editor toolbar is located at the top of the editor view. It is context
+ sensitive and shows items relevant to the file currently open in the editor.
- \if defined(qtcreator)
\image qtcreator-editortoolbar-symbols.webp {Edit mode toolbar}
To add more space around the toolbar items, select \uicontrol Edit >
@@ -35,9 +22,6 @@
then select \uicontrol Relaxed in the \uicontrol {Toolbar style} field.
\image qtcreator-preferences-environment-interface.webp {Interface tab in Environment preferences}
- \else
- \image studio-edit-mode.png
- \endif
\section2 Navigating Between Open Files and Symbols
@@ -72,10 +56,9 @@
\l{Searching with the Locator}{locator}. Enter the line number and column
number in the locator, separated by a colon (:).
- \note You can also use the \l{Browsing Project Contents}{sidebars} to
+ \note You can also use the \l{Show and hide sidebars}{sidebars} to
move around in \QC.
- \if defined(qtcreator)
\section2 Selecting Parse Context
Code might be interpreted differently in different contexts. A file can be
@@ -104,7 +87,6 @@
To reload the file with the selected encoding, select
\uicontrol {Reload with Encoding}. To save the file with
the new encoding, select \uicontrol {Save with Encoding}.
- \endif
\section2 Selecting Line Ending Style
@@ -120,7 +102,7 @@
To set the line endings to use for a project, select \uicontrol Projects >
\uicontrol {Project Settings} > \uicontrol Editor.
- \if defined(qtcreator)
+
For more information, see \l {Specifying Editor Settings}.
\section2 Managing Language Servers
@@ -132,7 +114,6 @@
\l{Inspecting Language Clients}{inspect the communication} between \QC
and language servers and view server capabilities, as well as
\l{Specifying Settings for Language Clients}{set language server preferences}.
- \endif
\section1 Editing Selected Lines
@@ -246,12 +227,7 @@
\endlist
To view the note, move the mouse pointer over the bookmark or open the
- \uicontrol Bookmarks view
- \if defined(qtcreator)
- in the \l{Show and hide sidebars}{sidebar}.
- \else
- in the \l{Managing Workspaces}{workspace}.
- \endif
+ \uicontrol Bookmarks view in the \l{Show and hide sidebars}{sidebar}.
\section2 Navigating Bookmarks
@@ -338,7 +314,6 @@
\uicontrol {Open Corresponding Header/Source in Next Split}. You can also
press \key F4 or \key {Ctrl+E,F4}, respectively.
- \if defined(qtcreator)
\section1 Reparsing Externally Changed Files
If source files are modified from outside \QC, the opened files will be
@@ -363,13 +338,4 @@
\QC underlines semantic errors in olive in the C++ code editor. To check the
correct paths for includes that are not resolved or that are resolved to the
wrong file, select \uicontrol {Project Parts} > \uicontrol {Header Paths}.
-
- \else
- \section1 Related Topics
-
- \list
- \li \l{Browsing Project Contents}
- \li \l{Viewing Output}
- \endlist
- \endif
*/
diff --git a/doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc b/doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc
index 43697c0f6d7..33a14ee3be2 100644
--- a/doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc
+++ b/doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc
@@ -29,11 +29,9 @@
{locator} or \l{Moving to Symbol Definition or Declaration}
{moving to the symbol definition}
\li Inspecting code by viewing the document outline in the
- \l{Viewing Defined Types and Symbols}{Outline} view or
- in the \uicontrol Symbols list on the \l{Using the Editor Toolbar}
- {editor toolbar}
- \li \l{Viewing Call Hierarchy}
- {Viewing the callers and callees of a function}
+ \l{Outline} view or in the \uicontrol Symbols list on the
+ \l{Using the Editor Toolbar}{editor toolbar}
+ \li \l{Call Hierarchy}{Viewing the callers and callees of a function}
\li \l{Finding Symbols}{Finding references to symbols}
\li \l{Renaming Symbols}{Renaming the symbol under cursor}
\li Code actions
@@ -94,7 +92,7 @@
patterns to extend the MIME types, separated by semicolons.
\li In the \uicontrol {Startup behavior} field, select whether the
language server is started when \QC starts or when a project or file
- with a matching MIME type is opened. \l{Viewing Output}
+ with a matching MIME type is opened. \l{View output}
{General Messages} displays information about the connection to the
language server.
\li In the \uicontrol {Initialization options} field, you can add
diff --git a/doc/qtcreator/src/editors/creator-only/creator-text-editing-macros.qdoc b/doc/qtcreator/src/editors/creator-only/creator-text-editing-macros.qdoc
index da398cff04f..6687e0241ae 100644
--- a/doc/qtcreator/src/editors/creator-only/creator-text-editing-macros.qdoc
+++ b/doc/qtcreator/src/editors/creator-only/creator-text-editing-macros.qdoc
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 The Qt Company Ltd.
+// Copyright (C) 2023 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
/*!
@@ -25,8 +25,7 @@
To assign a keyboard shortcut to a text editing macro, select
\uicontrol Edit > \uicontrol Preferences > \uicontrol Environment >
- \uicontrol Keyboard. For more information, see
- \l{Configuring Keyboard Shortcuts}.
+ \uicontrol Keyboard. For more information, see \l{Assign keyboard shortcuts}.
You can also use the \c rm locator filter to run a macro. For more
information, see \l{Searching with the Locator}.
diff --git a/doc/qtcreator/src/editors/creator-semantic-highlighting.qdoc b/doc/qtcreator/src/editors/creator-semantic-highlighting.qdoc
index 3ef73484ab3..41e8c1ea961 100644
--- a/doc/qtcreator/src/editors/creator-semantic-highlighting.qdoc
+++ b/doc/qtcreator/src/editors/creator-semantic-highlighting.qdoc
@@ -1,9 +1,13 @@
-// Copyright (C) 2021 The Qt Company Ltd.
+// Copyright (C) 2023 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
/*!
- \previouspage creator-coding-navigating.html
\page creator-highlighting.html
+ \if defined(qtdesignstudio)
+ \previouspage creator-editor-functions.html
+ \else
+ \previouspage creator-coding-navigating.html
+ \endif
\nextpage creator-checking-code-syntax.html
\title Semantic Highlighting
@@ -51,8 +55,8 @@
If the editor cannot find the highlight definition for a file that you open
for editing, it prompts you to download additional highlight definition
files. Select \uicontrol {Download Definitions} to download the files.
- Information about the downloaded files is displayed in \l{Viewing Output}
- {General Messages}.
+ To view information about the downloaded files, open the \l{View output}
+ {General Messages} view.
To suppress the message for a particular file pattern, select
\uicontrol Edit > \uicontrol Preferences > \uicontrol {Text Editor}
diff --git a/doc/qtcreator/src/howto/creator-external-tools.qdoc b/doc/qtcreator/src/howto/creator-external-tools.qdoc
index 219856879c5..8e003556cf8 100644
--- a/doc/qtcreator/src/howto/creator-external-tools.qdoc
+++ b/doc/qtcreator/src/howto/creator-external-tools.qdoc
@@ -113,7 +113,7 @@
working directory.
\li In the \uicontrol Output field, select how to handle output from the
- tool. You can ignore the output, view it in \l{Viewing Output}
+ tool. You can ignore the output, view it in \l{View output}
{General Messages}, or replace the selected text with the
output in the code editor.
diff --git a/doc/qtcreator/src/howto/creator-how-to-macos.qdoc b/doc/qtcreator/src/howto/creator-how-to-macos.qdoc
index 166fb4517af..30e5815efd9 100644
--- a/doc/qtcreator/src/howto/creator-how-to-macos.qdoc
+++ b/doc/qtcreator/src/howto/creator-how-to-macos.qdoc
@@ -5,8 +5,10 @@
\page creator-how-to-macos.html
\if defined(qtcreator)
\previouspage creator-how-tos.html
- \nextpage creator-known-issues.html
+ \else
+ \previouspage creator-quick-tour.html
\endif
+
\ingroup creator-how-to-ui
\ingroup studio-how-to
diff --git a/doc/qtcreator/src/howto/creator-how-to-set-high-dpi-scaling.qdoc b/doc/qtcreator/src/howto/creator-how-to-set-high-dpi-scaling.qdoc
index 681e6b421ad..2beda1e8f5d 100644
--- a/doc/qtcreator/src/howto/creator-how-to-set-high-dpi-scaling.qdoc
+++ b/doc/qtcreator/src/howto/creator-how-to-set-high-dpi-scaling.qdoc
@@ -5,8 +5,10 @@
\page creator-how-to-set-high-dpi-scaling.html
\if defined(qtcreator)
\previouspage creator-how-tos.html
- \nextpage creator-known-issues.html
+ \else
+ \previouspage creator-quick-tour.html
\endif
+
\ingroup creator-how-to-ui
\ingroup studio-how-to
@@ -32,6 +34,7 @@
\list 1
\li Select \uicontrol Edit > \uicontrol Preferences >
\uicontrol Environment > \uicontrol Interface.
+ \image qtcreator-preferences-environment-interface.webp {Interface tab in Environment preferences}
\li Select \uicontrol {Enable high DPI scaling}.
\li Restart \QC to have the change take effect.
\endlist
diff --git a/doc/qtcreator/src/howto/creator-how-to-switch-ui-themes.qdoc b/doc/qtcreator/src/howto/creator-how-to-switch-ui-themes.qdoc
index c03a50cf930..69272441a38 100644
--- a/doc/qtcreator/src/howto/creator-how-to-switch-ui-themes.qdoc
+++ b/doc/qtcreator/src/howto/creator-how-to-switch-ui-themes.qdoc
@@ -5,8 +5,10 @@
\page creator-how-to-switch-ui-themes.html
\if defined(qtcreator)
\previouspage creator-how-tos.html
- \nextpage creator-known-issues.html
+ \else
+ \previouspage creator-quick-tour.html
\endif
+
\ingroup creator-how-to-ui
\ingroup studio-how-to
diff --git a/doc/qtcreator/src/howto/creator-how-to-view-images.qdoc b/doc/qtcreator/src/howto/creator-how-to-view-images.qdoc
index 0671ed9980c..6a15f1274ad 100644
--- a/doc/qtcreator/src/howto/creator-how-to-view-images.qdoc
+++ b/doc/qtcreator/src/howto/creator-how-to-view-images.qdoc
@@ -5,8 +5,10 @@
\page creator-how-to-view-images.html
\if defined(qtcreator)
\previouspage creator-how-tos.html
- \nextpage creator-known-issues.html
+ \else
+ \previouspage creator-quick-tour.html
\endif
+
\ingroup creator-how-to-design
\ingroup studio-how-to-image-viewer
@@ -47,8 +49,10 @@
\page creator-how-to-export-svg-images.html
\if defined(qtcreator)
\previouspage creator-how-tos.html
- \nextpage creator-known-issues.html
+ \else
+ \previouspage creator-quick-tour.html
\endif
+
\ingroup creator-how-to-design
\ingroup studio-how-to-image-viewer
diff --git a/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc b/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc
index 3cec4df91d1..878a0f6cca6 100644
--- a/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc
+++ b/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc
@@ -17,21 +17,14 @@
\nextpage creator-editor-external.html
\endif
+ \ingroup creator-reference
+
\title Keyboard Shortcuts
- \QC has various keyboard shortcuts that speed up your development
- process. You can add more shortcuts if your favorite combination is
- missing. In addition, you can specify your own keyboard shortcuts for some
- functions that can be easily performed with a mouse, and therefore do not
- appear in menus or have default keyboard shortcuts. For example, selecting
- and deleting words or lines in an editor.
-
- To view all functions available in \QC and the keyboard shortcuts defined
- for them, select
+ \QC has various keyboard shortcuts that speed up your development process.
+ To view all \QC functions in and their keyboard shortcuts, select
\uicontrol Edit > \uicontrol Preferences > \uicontrol Environment >
- \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.
+ \uicontrol Keyboard.
\image qtcreator-keyboard-shortcuts.png
@@ -60,58 +53,10 @@
\image qtcreator-preferences-environment-interface.webp {Interface tab in Environment preferences}
- \section1 Configuring Keyboard Shortcuts
-
- To customize a keyboard shortcut:
-
- \list 1
-
- \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Environment
- > \uicontrol Keyboard.
-
- \li Select a command from the list.
-
- \li In the \uicontrol{Key Sequence} field, you have the following
- options:
-
- \list
-
- \li Enter the shortcut key you want to associate with the
- selected command.
-
- \li Select \uicontrol Record, press the keys to use as the
- keyboard shortcut, and select \uicontrol {Stop Recording}
- when you are done.
-
- \endlist
-
- \li To assign multiple keyboard shortcuts to a function, select
- \uicontrol Add, and enter or record an additional key combination.
-
- \li To revert to the default shortcut, select \uicontrol Reset.
-
- \endlist
-
- \QC allows you to use different keyboard shortcut mapping schemes:
-
- \list
-
- \li To import a keyboard shortcut mapping scheme, click \uicontrol Import
- and select the .kms file that has the keyboard shortcut mapping scheme
- you want to import.
-
- \li To export the current keyboard shortcut mapping scheme, click
- \uicontrol Export and select the location where you want to save the
- exported .kms file.
-
- \endlist
-
- \section1 Default Keyboard Shortcuts
-
The following tables list the default keyboard shortcuts. They are
categorized by actions.
- \section2 General Keyboard Shortcuts
+ \section1 General Keyboard Shortcuts
\table
\header
@@ -183,9 +128,11 @@
\row
\li Previous open document in history
\li Ctrl+Tab
+ \if defined(qtcreator)
\row
\li Activate \uicontrol Locator
\li Ctrl+K
+ \endif
\row
\li Switch to \uicontrol Welcome mode
\li Ctrl+1
@@ -253,6 +200,7 @@
\row
\li Undo
\li Ctrl+Z
+ \if defined(qtcreator)
\row
\li Move to \uicontrol Edit mode
@@ -262,6 +210,7 @@
\li The second press closes secondary windows
\endlist
\li Esc
+ \endif
\row
\li Exit \QC
@@ -273,7 +222,7 @@
\li Ctrl+Q
\endtable
- \section2 Editing Keyboard Shortcuts
+ \section1 Editing Keyboard Shortcuts
\table
\header
@@ -395,25 +344,7 @@
\row
\li Visualize whitespace
\li Ctrl+E, Ctrl+V
- \row
- \li Adjust size
- \li Ctrl+J
- \row
- \li Lay out in a grid
- \li Ctrl+G
- \row
- \li Lay out horizontally
- \li Ctrl+H
- \row
- \li Lay out vertically
- \li Ctrl+L
- \row
- \li Preview
- \li Alt+Shift+R
\if defined(qtcreator)
- \row
- \li Edit signals and slots
- \li F4
\row
\li Toggle bookmark
\li Ctrl+M
@@ -518,7 +449,7 @@
\endtable
\if defined(qtcreator)
- \section3 Emacs Shortcuts
+ \section1 Emacs Shortcuts
You can specify shortcuts for executing actions in a way that is familiar to
\l{https://www.gnu.org/software/emacs/manual/html_node/emacs/index.html}
@@ -549,7 +480,33 @@
\li Yank
\endlist
- \section2 Image Viewer Shortcuts
+ \section1 \QD Shortcuts
+
+ \table
+ \header
+ \li Action
+ \li Keyboard shortcut
+ \row
+ \li Adjust size
+ \li Ctrl+J
+ \row
+ \li Lay out in a grid
+ \li Ctrl+G
+ \row
+ \li Lay out horizontally
+ \li Ctrl+H
+ \row
+ \li Lay out vertically
+ \li Ctrl+L
+ \row
+ \li Preview
+ \li Alt+Shift+R
+ \row
+ \li Edit signals and slots
+ \li F4
+ \endtable
+
+ \section1 Image Viewer Shortcuts
\table
\header
@@ -577,7 +534,7 @@
\endif
\if defined(qtdesignstudio)
- \section2 Design Mode Keyboard Shortcuts
+ \section1 Design Mode Keyboard Shortcuts
You can use the following keyboard shortcuts when editing QML files in the
\uicontrol Design mode.
@@ -602,7 +559,8 @@
\endtable
\endif
- \section2 Debugging Keyboard Shortcuts
+ \if defined(qtcreator)
+ \section1 Debugging Keyboard Shortcuts
\table
\header
@@ -639,8 +597,9 @@
\li Reverse direction
\li F12
\endtable
+ \endif
- \section2 Project Keyboard Shortcuts
+ \section1 Project Keyboard Shortcuts
\table
\header
@@ -670,7 +629,7 @@
\li Ctrl+R
\endtable
- \section2 Help Keyboard Shortcuts
+ \section1 Help Keyboard Shortcuts
\table
\header
@@ -696,7 +655,7 @@
\li Ctrl+S
\endtable
- \section2 Version Control Keyboard Shortcuts
+ \section1 Version Control Keyboard Shortcuts
\if defined(qtcreator)
\table
@@ -830,4 +789,139 @@
\li Alt+G, Alt+U
\endtable
\endif
+
+ \sa {Assign keyboard shortcuts}, {Find keyboard shortcuts},
+ {Import and export keyboard shortcuts}
+*/
+
+/*!
+ \page creator-how-to-assign-keyboard-shortcuts.html
+ \if defined(qtdesignstudio)
+ \previouspage creator-keyboard-shortcuts.html
+ \nextpage studio-projects.html
+ \else
+ \previouspage creator-how-tos.html
+
+ \endif
+
+ \ingroup creator-how-to-ui
+
+ \title Assign keyboard shortcuts
+
+ If your favorite keyboard shortcut is missing, you can add it. Also, you can
+ assign your own keyboard shortcuts for functions that you can easily perform
+ with a mouse, and that therefore do not appear in menus or have default
+ keyboard shortcuts. For example, selecting and deleting words or lines in an
+ editor.
+
+ To change an existing keyboard shortcut or assign a new one:
+
+ \list 1
+
+ \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Environment
+ > \uicontrol Keyboard.
+ \image qtcreator-keyboard-shortcuts.png {Keyboard preferences}
+
+ \li Select a command from the list.
+
+ \li In the \uicontrol{Key Sequence} field, you have the following
+ options:
+
+ \list
+
+ \li Enter the shortcut key you want to associate with the
+ selected command.
+
+ \li Record a key sequence.
+
+ \endlist
+
+ \li To assign multiple keyboard shortcuts to a function, select
+ \uicontrol Add, and enter or record an additional key combination.
+
+ \li To revert to the default shortcut, select \uicontrol Reset.
+
+ \endlist
+
+ \section1 Record key sequences
+
+ \list 1
+ \li Select \uicontrol Record.
+ \li Press the keys to use as the keyboard shortcut.
+ \li Select \uicontrol {Stop Recording} when you are done.
+ \endlist
+
+ \sa {Keyboard Shortcuts}, {Find keyboard shortcuts},
+ {Import and export keyboard shortcuts}
+*/
+
+/*!
+ \page creator-how-to-find-keyboard-shortcuts.html
+ \if defined(qtdesignstudio)
+ \previouspage creator-keyboard-shortcuts.html
+ \nextpage studio-projects.html
+ \else
+ \previouspage creator-how-tos.html
+
+ \endif
+
+ \ingroup creator-how-to-ui
+
+ \title Find keyboard shortcuts
+
+ \QC has many useful keyboard shortcuts. You can see the keyboard shortcut for
+ a menu command in the menu or the tooltip for a button or in the keyboard
+ preferences.
+
+ To look up keyboard shortcuts:
+
+ \list 1
+ \li Select uicontrol Edit > \uicontrol Preferences >
+ \uicontrol Environment > \uicontrol Keyboard.
+ \image qtcreator-keyboard-shortcuts.png {Keyboard preferences}
+ \li Start typing the name of a function or shortcut in the
+ \uicontrol Filter field.
+ \endlist
+
+ You can change the existing keyboard shortcuts or import and export them.
+
+ \sa {Keyboard Shortcuts}, {Assign keyboard shortcuts},
+ {Import and export keyboard shortcuts}
+*/
+
+/*!
+ \page creator-how-to-change-keyboard-shortcuts.html
+ \if defined(qtdesignstudio)
+ \previouspage creator-keyboard-shortcuts.html
+ \nextpage studio-projects.html
+ \else
+ \previouspage creator-how-tos.html
+
+ \endif
+
+ \title Import and export keyboard shortcuts
+
+ You can use different keyboard shortcut mapping schemes that are stored as
+ .kms files.
+
+ To import and export keyboard shortcut mapping schemes:
+
+ \list 1
+
+ \li Select uicontrol Edit > \uicontrol Preferences >
+ \uicontrol Environment > \uicontrol Keyboard.
+ \image qtcreator-keyboard-shortcuts.png {Keyboard preferences}
+
+ \li To import a keyboard shortcut mapping scheme, click \uicontrol Import
+ and select the .kms file that has the keyboard shortcut mapping scheme
+ you want to import.
+
+ \li To export the current keyboard shortcut mapping scheme, click
+ \uicontrol Export and select the location where you want to save the
+ exported .kms file.
+
+ \endlist
+
+ \sa {Keyboard Shortcuts}, {Assign keyboard shortcuts},
+ {Find keyboard shortcuts}
*/
diff --git a/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc b/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc
index 46b8781c08a..dab584171bc 100644
--- a/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc
+++ b/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc
@@ -584,7 +584,7 @@
\section1 Viewing Test Output
- The \l{Viewing Output}{Test Results} view shows Qt and Qt Quick test results
+ The \l{View output}{Test Results} view shows Qt and Qt Quick test results
in XML format and other test results in plain text format.
\section2 Qt Test Output
diff --git a/doc/qtcreator/src/howto/creator-only/creator-how-to-enable-plugins.qdoc b/doc/qtcreator/src/howto/creator-only/creator-how-to-enable-plugins.qdoc
index 72592cdca5a..6cf11eff11f 100644
--- a/doc/qtcreator/src/howto/creator-only/creator-how-to-enable-plugins.qdoc
+++ b/doc/qtcreator/src/howto/creator-only/creator-how-to-enable-plugins.qdoc
@@ -4,7 +4,7 @@
/*!
\page creator-how-to-enable-plugins.html
\previouspage creator-how-tos.html
- \nextpage creator-known-issues.html
+
\ingroup creator-how-to-use
\title Enable and disable plugins
@@ -16,7 +16,10 @@
on are also enabled.
You can also disable plugins that you do not use, to streamline \QC.
- By default, all the plugins that depend on the plugin are also disabled.
+ If you disable a plugin, \QC asks you to disable all plugins that
+ depend on it. This might lead to some features not working properly.
+ Further, the plugins are not automatically enabled if you enable the
+ first plugin again.
To enable and disable plugins:
diff --git a/doc/qtcreator/src/howto/creator-only/creator-how-to-find-settings-files.qdoc b/doc/qtcreator/src/howto/creator-only/creator-how-to-find-settings-files.qdoc
index 42cb4759648..8bfb773a402 100644
--- a/doc/qtcreator/src/howto/creator-only/creator-how-to-find-settings-files.qdoc
+++ b/doc/qtcreator/src/howto/creator-only/creator-how-to-find-settings-files.qdoc
@@ -4,7 +4,7 @@
/*!
\page creator-how-to-find-settings-files.html
\previouspage creator-how-tos.html
- \nextpage creator-known-issues.html
+
\ingroup creator-how-to-use
\title Find settings files
diff --git a/doc/qtcreator/src/howto/creator-only/creator-how-to-install-plugins.qdoc b/doc/qtcreator/src/howto/creator-only/creator-how-to-install-plugins.qdoc
index 10eb5e36c45..711e036c519 100644
--- a/doc/qtcreator/src/howto/creator-only/creator-how-to-install-plugins.qdoc
+++ b/doc/qtcreator/src/howto/creator-only/creator-how-to-install-plugins.qdoc
@@ -4,7 +4,7 @@
/*!
\page creator-how-to-install-plugins.html
\previouspage creator-how-tos.html
- \nextpage creator-known-issues.html
+
\ingroup creator-how-to-use
\title Install plugins
diff --git a/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc b/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc
index ae2b15c2509..9e2dc2afc40 100644
--- a/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc
+++ b/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc
@@ -10,7 +10,7 @@
/*!
\previouspage creator-faq.html
\page creator-how-tos.html
- \nextpage creator-known-issues.html
+ \nextpage creator-reference.html
\title How-to
@@ -19,9 +19,11 @@
\section1 Use the UI
\list
+ \li \l {Assign keyboard shortcuts}
\li \l {Find a particular preference}
\li \l {Find keyboard shortcuts}
\li \l {Find menu items on \macos}
+ \li \l {Import and export keyboard shortcuts}
\li \l {Set high DPI scaling}
\li \l {Set the number of recent files shown}
\li \l {Show and hide sidebars}
@@ -74,7 +76,7 @@
/*!
\page creator-how-to-move-between-open-files.html
\previouspage creator-how-tos.html
- \nextpage creator-known-issues.html
+
\ingroup creator-how-to-edit
\title Move between open files
@@ -83,8 +85,10 @@
\key Ctrl+Tab.
To move forward in the location history, press \key {Alt+Right}
- (\key {Cmd+Opt+Right} on \macos). To move backward, press \key {Alt+Left}
- (\key {Cmd+Opt+Left} on \macos). For example, if you use the \uicontrol Locator
+ (\key {Cmd+Opt+Right} on \macos).
+
+ To move backward, press \key {Alt+Left} (\key {Cmd+Opt+Left} on \macos).
+ For example, if you use the \uicontrol Locator
to jump to a symbol in the same file, you can jump back to your original
location in that file by pressing \key {Alt+Left}.
*/
@@ -92,7 +96,7 @@
/*!
\page creator-how-to-switch-to-edit-mode.html
\previouspage creator-how-tos.html
- \nextpage creator-known-issues.html
+
\ingroup creator-how-to-edit
\title Switch to Edit mode
@@ -114,7 +118,7 @@
/*!
\page creator-how-to-find-preferences.html
\previouspage creator-how-tos.html
- \nextpage creator-known-issues.html
+
\ingroup creator-how-to-ui
\title Find a particular preference
@@ -125,60 +129,10 @@
\image qtcreator-preferences.webp {Filtering preferences}
*/
-/*!
- \page creator-how-to-view-output.html
- \previouspage creator-how-tos.html
- \nextpage creator-known-issues.html
- \ingroup creator-how-to-ui
-
- \title View output
-
- The \l{Viewing Output}{taskbar} shows output from
- several sources, such as a list of errors and warnings encountered during
- a build, detailed output from the compiler, status of a program when it is
- executed, debug output, or search results.
-
- \image qtcreator-output-panes-taskbar.webp "Output on the taskbar"
-
- To view different types of output, use the following shortcuts:
-
- \list
-
- \li \uicontrol{Issues} - \key Alt+1 (\key Cmd+1 on \macos)
-
- \li \uicontrol{Search Results} - \key Alt+2 (\key Cmd+2 on \macos)
-
- \li \uicontrol{Application Output} - \key Alt+3 (\key Cmd+3 on \macos)
-
- \li \uicontrol{Compile Output} - \key Alt+4 (\key Cmd+4 on \macos)
-
- \endlist
-
- For additional ways to view other types of output, see \l{Viewing Output}.
-*/
-
-/*!
- \page creator-how-to-find-keyboard-shortcuts.html
- \previouspage creator-how-tos.html
- \nextpage creator-known-issues.html
- \ingroup creator-how-to-ui
-
- \title Find keyboard shortcuts
-
- \QC has \l{Keyboard Shortcuts}{many useful keyboard shortcuts}.
- 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 Edit >
- \uicontrol Preferences > \uicontrol Environment > \uicontrol Keyboard.
-
- \image qtcreator-keyboard-shortcuts.png "Keyboard preferences"
-*/
-
/*!
\page creator-how-to-run-from-cli.html
\previouspage creator-how-tos.html
- \nextpage creator-known-issues.html
+
\ingroup creator-how-to-use
\title Run \QC from the command line
@@ -196,7 +150,7 @@
/*!
\page creator-how-to-move-to-symbols.html
\previouspage creator-how-tos.html
- \nextpage creator-known-issues.html
+
\ingroup creator-how-to-edit
\title Move to symbols
@@ -219,7 +173,7 @@
/*!
\page creator-how-to-locate-files-using-keyboard.html
\previouspage creator-how-tos.html
- \nextpage creator-known-issues.html
+
\ingroup creator-how-to-edit
\title Locate files using the keyboard
@@ -244,7 +198,7 @@
/*!
\page creator-how-to-perform-calculations.html
\previouspage creator-how-to-move-between-open-files.html
- \nextpage creator-known-issues.html
+
\ingroup creator-how-to-edit
\title Perform calculations
@@ -261,7 +215,7 @@
/*!
\page creator-how-to-jump-to-functions-in-qml-code.html
\previouspage creator-how-tos.html
- \nextpage creator-known-issues.html
+
\ingroup creator-how-to-edit
\title Jump to a function in QML code
@@ -273,7 +227,7 @@
/*!
\page creator-how-to-add-license-header-templates.html
\previouspage creator-how-tos.html
- \nextpage creator-known-issues.html
+
\ingroup creator-how-to-projects
\title Add a license header template for C++ code
@@ -304,7 +258,7 @@
/*!
\page creator-how-to-paste-text-from-clipboard-history.html
\previouspage creator-how-tos.html
- \nextpage creator-known-issues.html
+
\ingroup creator-how-to-edit
\title Paste text from clipboard history
@@ -317,7 +271,7 @@
/*!
\page creator-how-to-sort-lines-alphabetically.html
\previouspage creator-how-tos.html
- \nextpage creator-known-issues.html
+
\ingroup creator-how-to-edit
\title Sort lines alphabetically
@@ -330,7 +284,7 @@
/*!
\page creator-enclose-code-in-characters.html
\previouspage creator-how-tos.html
- \nextpage creator-known-issues.html
+
\ingroup creator-how-to-edit
\title Enclose selected code in curly braces, parentheses, or double quotes
@@ -355,7 +309,7 @@
/*!
\page creator-how-to-select-enclosing-block.html
\previouspage creator-how-tos.html
- \nextpage creator-known-issues.html
+
\ingroup creator-how-to-edit
\title Select the enclosing block in C++
@@ -366,7 +320,7 @@
/*!
\page creator-how-to-add-code-snippets.html
\previouspage creator-how-tos.html
- \nextpage creator-known-issues.html
+
\ingroup creator-how-to-edit
\title Add code snippets to the auto-complete menu
@@ -383,7 +337,7 @@
/*!
\page creator-how-to-write-notes.html
\previouspage creator-how-tos.html
- \nextpage creator-known-issues.html
+
\ingroup creator-how-to-edit
\title Write down notes
@@ -412,22 +366,27 @@
/*!
\page creator-how-to-set-recent-files.html
\previouspage creator-how-tos.html
- \nextpage creator-known-issues.html
+
\ingroup creator-how-to-ui
\title Set the number of recent files shown
- Set the value of \uicontrol Edit > \uicontrol Preferences >
- \uicontrol Environment > \uicontrol System
- > \uicontrol {Maximum number of entries in "Recent Files"}.
+ To set the number of files to list in \uicontrol File >
+ \uicontrol {Recent Files}:
- \image qtcreator-options-environment-system.png "System preferences"
+ \list 1
+ \li Select \uicontrol Edit > \uicontrol Preferences >
+ \uicontrol Environment > \uicontrol System.
+ \image qtcreator-options-environment-system.png {System preferences}
+ \li In \uicontrol {Maximum number of entries in "Recent Files"}, set
+ the number of files to show.
+ \endlist
*/
/*!
\page creator-how-to-search-and-replace-using-regexp.html
\previouspage creator-how-to-move-between-open-files.html
- \nextpage creator-known-issues.html
+
\ingroup creator-how-to-edit
\title Search and replace across files using a regular expression
diff --git a/doc/qtcreator/src/howto/creator-only/creator-squish.qdoc b/doc/qtcreator/src/howto/creator-only/creator-squish.qdoc
index 874b4b389e4..25b2d54dad5 100644
--- a/doc/qtcreator/src/howto/creator-only/creator-squish.qdoc
+++ b/doc/qtcreator/src/howto/creator-only/creator-squish.qdoc
@@ -22,7 +22,7 @@
\li Record test cases (in a very limited way compared to what you can do
inside the Squish IDE).
\li Use Squish Runner and Server to run test suites or cases and view
- the results in the \uicontrol Squish \l{Viewing Output}{output}.
+ the results in the \uicontrol Squish \l{View output}{output}.
\li Set breakpoints before running tests to stop at certain locations and
inspect the local variables, similarly to when debugging a test.
\endlist
diff --git a/doc/qtcreator/src/overview/creator-only/creator-configuring.qdoc b/doc/qtcreator/src/overview/creator-only/creator-configuring.qdoc
index 2e9330159f5..95906339121 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-configuring.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-configuring.qdoc
@@ -8,7 +8,7 @@
// **********************************************************************
/*!
- \previouspage creator-output-panes.html
+ \previouspage creator-quick-tour.html
\page creator-configuring.html
\nextpage creator-build-example-application.html
diff --git a/doc/qtcreator/src/overview/creator-only/creator-help-overview.qdoc b/doc/qtcreator/src/overview/creator-only/creator-help-overview.qdoc
index 4b7db858d43..bf792f5564d 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-help-overview.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-help-overview.qdoc
@@ -34,6 +34,10 @@
Lists useful \QC features.
+ \li \l{Reference}
+
+ Lists the sidebar views and the output views.
+
\li \l{Known Issues}
Lists known issues in \QC version \qtcversion. The development team
diff --git a/doc/qtcreator/src/overview/creator-only/creator-reference.qdoc b/doc/qtcreator/src/overview/creator-only/creator-reference.qdoc
new file mode 100644
index 00000000000..22dfff65739
--- /dev/null
+++ b/doc/qtcreator/src/overview/creator-only/creator-reference.qdoc
@@ -0,0 +1,22 @@
+// Copyright (C) 2023 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
+
+/*!
+ \page creator-reference.html
+ \previouspage creator-how-tos.html
+ \nextpage creator-known-issues.html
+
+ \title Reference
+
+ The following topics describe the different parts of the UI in detail.
+
+ \section1 Sidebar Views
+
+ \annotatedlist creator-reference-sidebar-views
+
+ \section1 Output Views
+
+ \annotatedlist creator-reference-output-views
+
+ \sa {User Interface}, {Show and hide sidebars}, {View output}
+*/
diff --git a/doc/qtcreator/src/overview/creator-only/creator-tutorials.qdoc b/doc/qtcreator/src/overview/creator-only/creator-tutorials.qdoc
index e75d8fb4a5d..244310c17bf 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-tutorials.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-tutorials.qdoc
@@ -1,40 +1,16 @@
-// Copyright (C) 2020 The Qt Company Ltd.
+// Copyright (C) 2023 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
-// **********************************************************************
-// NOTE: the sections are not ordered by their logical order to avoid
-// reshuffling the file each time the index order changes (i.e., often).
-// Run the fixnavi.pl script to adjust the links to the index order.
-// **********************************************************************
-
/*!
\previouspage creator-build-example-application.html
\page creator-tutorials.html
- \nextpage {Creating a Qt Quick Application}
+ \nextpage creator-project-managing.html
\title Tutorials
- \image front-help.png
-
- You can use \QC to create applications for several platforms by using
- several technologies. The tutorials in this manual explain how to create
- some basic applications.
-
- \list
-
- \li \l{Creating a Qt Quick Application}
-
- Learn how to create a Qt Quick application.
-
- \li \l{Creating a Qt Widget Based Application}
-
- Learn how to create a Qt widget based application for the desktop.
-
- \li \l{Creating a Mobile Application}
-
- Learn how to create a Qt Quick application using Qt Quick Controls
- for Android and iOS devices.
-
- \endlist
+ You can use \QC to create applications for several \l{Supported Platforms}
+ {platforms} by using several \l{User Interfaces}{UI technologies}. Follow
+ the tutorials to learn how to create some basic Qt applications.
+ \annotatedlist creator-tutorials
*/
diff --git a/doc/qtcreator/src/qtcreator-toc.qdoc b/doc/qtcreator/src/qtcreator-toc.qdoc
index eb8ced88e3b..f39905835fc 100644
--- a/doc/qtcreator/src/qtcreator-toc.qdoc
+++ b/doc/qtcreator/src/qtcreator-toc.qdoc
@@ -1,7 +1,6 @@
// Copyright (C) 2023 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
-
/*!
\page qtcreator-toc.html
@@ -18,23 +17,9 @@
\list
\li \l{IDE Overview}
\li \l{User Interface}
- \list
- \li \l{Browsing Project Contents}
- \list
- \li \l{Projects}
- \li \l{File System}
- \li \l{Open Documents}
- \endlist
- \li \l{Viewing Output}
- \endlist
\li \l{Configuring Qt Creator}
\li \l{Building and Running an Example}
\li \l{Tutorials}
- \list
- \li \l{Creating a Qt Quick Application}
- \li \l{Creating a Qt Widget Based Application}
- \li \l{Creating a Mobile Application}
- \endlist
\endlist
\li \l{Managing Projects}
\list
@@ -254,6 +239,76 @@
\li \l{Using the Help Mode}
\li \l{FAQ}
\li \l{How-to}
+ \list
+ \li Use the UI
+ \list
+ \li \l {Assign keyboard shortcuts}
+ \li \l {Find a particular preference}
+ \li \l {Find keyboard shortcuts}
+ \li \l {Find menu items on \macos}
+ \li \l {Import and export keyboard shortcuts}
+ \li \l {Set high DPI scaling}
+ \li \l {Set the number of recent files shown}
+ \li \l {Show and hide sidebars}
+ \li \l {Switch between modes}
+ \li \l {Switch UI themes}
+ \li \l {View output}
+ \endlist
+ \li Edit Code
+ \list
+ \li \l {Add code snippets to the auto-complete menu}
+ \li \l {Enclose selected code in curly braces, parentheses, or double quotes}
+ \li \l {Jump to a function in QML code}
+ \li \l {Locate files using the keyboard}
+ \li \l {Move between open files}
+ \li \l {Move to symbols}
+ \li \l {Paste text from clipboard history}
+ \li \l {Perform calculations}
+ \li \l {Search and replace across files using a regular expression}
+ \li \l {Select the enclosing block in C++}
+ \li \l {Sort lines alphabetically}
+ \li \l {Switch to Edit mode}
+ \li \l {Write down notes}
+ \endlist
+ \li Design UIs
+ \list
+ \li \l {Export SVG images}
+ \li \l {View images}
+ \endlist
+ \li Manage Projects
+ \list
+ \li \l {Add a license header template for C++ code}
+ \endlist
+ \li Use \QC
+ \list
+ \li \l {Enable and disable plugins}
+ \li \l {Find settings files}
+ \li \l {Install plugins}
+ \li \l {Run \QC from the command line}
+ \endlist
+ \endlist
+ \li \l{Reference}
+ \list
+ \li Sidebar Views
+ \list
+ \li \l {Call Hierarchy}
+ \li \l {Class View}
+ \li \l {File System}
+ \li \l {Include Hierarchy}
+ \li \l {Open Documents}
+ \li \l {Outline}
+ \li \l {Projects}
+ \li \l {Type Hierarchy}
+ \endlist
+ \li Output Views
+ \list
+ \li \l {Application Output}
+ \li \l {Compile Output}
+ \li \l {Issues}
+ \li \l {Search Results}
+ \li \l {To-Do Entries}
+ \endlist
+ \endlist
\li \l{Known Issues}
\li \l{Glossary}
\li \l{Technical Support}
diff --git a/doc/qtcreator/src/qtcreator.qdoc b/doc/qtcreator/src/qtcreator.qdoc
index 60f61a9561c..d1aba95665d 100644
--- a/doc/qtcreator/src/qtcreator.qdoc
+++ b/doc/qtcreator/src/qtcreator.qdoc
@@ -104,6 +104,7 @@
\li \l{Using the Help Mode}
\li \l{FAQ}
\li \l{How-to}
+ \li \l{Reference}
\li \l{Known Issues}
\li \l{Glossary}
\endlist
diff --git a/doc/qtcreator/src/qtquick/creator-only/creator-mobile-app-tutorial.qdoc b/doc/qtcreator/src/qtquick/creator-only/creator-mobile-app-tutorial.qdoc
index 7ca4ea2a017..6d617292b76 100644
--- a/doc/qtcreator/src/qtquick/creator-only/creator-mobile-app-tutorial.qdoc
+++ b/doc/qtcreator/src/qtquick/creator-only/creator-mobile-app-tutorial.qdoc
@@ -1,25 +1,23 @@
-// 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
-// **********************************************************************
-// NOTE: the sections are not ordered by their logical order to avoid
-// reshuffling the file each time the index order changes (i.e., often).
-// Run the fixnavi.pl script to adjust the links to the index order.
-// **********************************************************************
-
/*!
- \previouspage creator-writing-program.html
\example accelbubble
+ \previouspage creator-tutorials.html
\nextpage creator-project-managing.html
+ \ingroup creator-tutorials
\title Creating a Mobile Application
+ \brief How to create a Qt Quick application that uses Qt Quick Controls and
+ runs on Android and iOS devices.
+
This tutorial describes how to use \QC to develop Qt Quick applications for
Android and iOS devices when using Qt 6 as the minimum Qt version and CMake
as the build system.
- We implement a Qt Quick application that accelerates an SVG (Scalable Vector
- Graphics) image based on the changing accelerometer values.
+ You will develop a Qt Quick application that accelerates an SVG
+ (Scalable Vector Graphics) image based on changing accelerometer values.
\note You must have the \l{Qt Sensors} module from Qt 6.2 or later installed
to be able to follow this tutorial.
@@ -48,9 +46,6 @@
The main view of the application displays an SVG bubble image that moves
around the screen when you tilt the device.
- We use \e {Bluebubble.svg} in this tutorial, but you can use any other
- image or component instead.
-
For the image to appear when you run the application, you must specify it
as a resource in the \c RESOURCES section of \e CMakeLists.txt file that
the wizard created for you:
@@ -61,31 +56,33 @@
\section1 Creating the Accelbubble Main View
- We create the main view in the \e main.qml file by adding an \l Image
+ Create the main view in the \e main.qml file by adding an \l Image
component with \e Bluebubble.svg as the source:
\quotefromfile accelbubble/main.qml
\skipto Image
\printuntil smooth
- Next, we add custom properties to position the image in respect to the width
+ You can use any other image or component instead.
+
+ Add custom properties to position the image in respect to the width
and height of the main window:
\printuntil y:
- We now want to add code to move the bubble based on Accelerometer sensor
- values. First, we add the following import statement:
+ Add code to move the bubble based on Accelerometer sensor
+ values. First, add the following import statement:
\quotefromfile accelbubble/main.qml
\skipto QtSensors
\printline QtSensors
- Next, we add the \l{Accelerometer} component with the necessary properties:
+ Add the \l{Accelerometer} component with the necessary properties:
\skipto Accelerometer
\printuntil active
- Then, we add the following JavaScript functions that calculate the
+ Add the following JavaScript functions that calculate the
x and y position of the bubble based on the current Accelerometer
values:
@@ -94,7 +91,7 @@
\printuntil }
\printuntil }
- We add the following JavaScript code for \c onReadingChanged signal of
+ Add the following JavaScript code for \c onReadingChanged signal of
Accelerometer component to make the bubble move when the Accelerometer
values change:
@@ -102,12 +99,12 @@
\skipto onReadingChanged
\printuntil }
- We want to ensure that the position of the bubble is always
+ You need to ensure that the position of the bubble is always
within the bounds of the screen. If the Accelerometer returns
\e {not a number} (NaN), the value is ignored and the bubble
position is not updated.
- We add \l SmoothedAnimation behavior on the \c x and \c y properties of
+ Add \l SmoothedAnimation behavior on the \c x and \c y properties of
the bubble to make its movement look smoother.
\quotefromfile accelbubble/main.qml
@@ -126,7 +123,7 @@
an \e AndroidManifest.xml that you can generate in \QC. For more information,
see \l{Editing Manifest Files}.
- \image qtquick-mobile-tutorial-manifest.png "Accelbubble manifest file"
+ \image qtquick-mobile-tutorial-manifest.png {Accelbubble manifest file}
To generate and use a manifest file, you must specify the Android package
source directory, \c QT_ANDROID_PACKAGE_SOURCE_DIR in the \e CMakeLists.txt
@@ -136,14 +133,14 @@
\skipto set_property
\printuntil )
- Because our CMake version is older than 3.19, we must add a manual
+ Because the CMake version is older than 3.19, add a manual
finalization step to the \c qt_add_executable function:
\quotefromfile accelbubble/CMakeLists.txt
\skipto qt_add_executable
\printuntil )
- We also need to add the \c qt_finalize_executable function:
+ Then, add the \c qt_finalize_executable function:
\skipto qt_finalize_executable
\printuntil )
diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-app-tutorial.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-app-tutorial.qdoc
index 4aca5466c39..e80eeca778c 100644
--- a/doc/qtcreator/src/qtquick/creator-only/qtquick-app-tutorial.qdoc
+++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-app-tutorial.qdoc
@@ -1,13 +1,16 @@
-// Copyright (C) 2021 The Qt Company Ltd.
+// Copyright (C) 2023 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
/*!
- \previouspage creator-tutorials.html
\example transitions
- \nextpage creator-writing-program.html
+ \previouspage creator-tutorials.html
+ \nextpage creator-project-managing.html
+ \ingroup creator-tutorials
\title Creating a Qt Quick Application
+ \brief How to create a Qt Quick Application in the \uicontrol Edit mode.
+
This tutorial illustrates basic concepts of \l{Qt Quick}. For more
information about the UI choices you have, see \l{User Interfaces}.
@@ -15,10 +18,10 @@
{states} and \l{Animation and Transitions in Qt Quick}{transitions}
when using Qt 6 as the minimum Qt version and CMake as the build system.
- We use the \l{Working in Edit Mode}{Edit mode} to create an application
+ You will use the \l{Working in Edit Mode}{Edit mode} to create an application
that moves a Qt logo between three rectangles when you click them.
- \image qtquick-tutorial.gif "Transitions example"
+ \image qtquick-tutorial.gif {Transitions example}
For more examples, see \l{Qt Quick Examples and Tutorials}.
@@ -35,9 +38,6 @@
The main view of the application displays a Qt logo inside a rectangle in
the top left corner of the view and two empty rectangles.
- We use the \e qt-logo.png image in this tutorial, but you can also use
- any other image or a component, instead.
-
For the image to appear when you run the application, you must specify it
as a resource in the \c RESOURCES section of \e CMakeLists.txt file that
the wizard created for you:
@@ -49,8 +49,8 @@
\section1 Creating Custom QML Types
Because the \l Window QML type requires that you add states into child
- components, we use the wizard to create a custom QML type called
- \e Page that we will refer to from \e main.qml.
+ components, use the wizard to create a custom QML type called
+ \e Page that you refer to from \e Main.qml.
To create a custom QML type:
@@ -60,14 +60,14 @@
\uicontrol {QML File (Qt Quick 2)}.
\li Select \uicontrol Choose to open the \uicontrol Location dialog.
\li In the \uicontrol {File name} field, enter a name for the custom
- QML type. In this example, we call the type \e Page.
+ QML type: \e Page.
\li Select \uicontrol Next to open the \uicontrol {Project Management}
dialog.
\li Select \uicontrol Finish to create \e Page.qml.
\endlist
\QC opens \e Page.qml in the \uicontrol Edit mode. It has a root item
- of the type \l Item that we replace with a \l Rectangle type. We give the
+ of the type \l Item. Replace it with a \l Rectangle type. Give the
type the ID \e page, anchor it to the parent item on all sides, and set
its color to white:
@@ -75,9 +75,6 @@
\skipto import
\printuntil color
- Because we develop with Qt 6, where version numbers are not used with
- modules, we remove the version number from the import statement.
-
When you start typing the QML type name, \QC suggests available types
and properties to \l{Completing Code}{complete the code}.
@@ -86,66 +83,67 @@
{Qt Quick Toolbar for rectangles}. You can use it to specify
rectangle properties, such as color, transparency, and gradients.
- \image qml-toolbar-rectangle.png "Qt Quick Toolbar for rectangles"
+ \image qml-toolbar-rectangle.png {Qt Quick Toolbar for rectangles}
- Next, we add an \l Image type with \e qt-logo.png as the source. We
- position the image in the top-left corner of the rectangle:
+ Next, add an \l Image type with \e qt-logo.png as the source. You can also
+ use any other image or a component. Position the image in the top-left
+ corner of the rectangle:
\printuntil }
You can use the \l{Previewing Images}{Qt Quick Toolbar for images} to
specify image properties, such as source file and fill mode.
- \image qml-toolbar-image.png "Logo visible in Qt Quick Toolbar for images"
+ \image qml-toolbar-image.png {Logo visible in Qt Quick Toolbar for images}
- We now create the rectangles that the image will move between. Their size
+ Now, create the rectangles that the image will move between. Their size
should match the image size and they should be transparent, so that the
- image is visible. We set the border color to light gray to make the
+ image is visible. Set the border color to light gray to make the
rectangles visible:
\printuntil border.color
- We anchor the rectangles to their parent to position them in its
+ Anchor the rectangles to their parent to position them in its
top-left and bottom-left corners, as well as the vertical center
of its right edge. The following code snippet anchors a rectangle to
the top-left corner of its parent:
\printuntil anchors.topMargin
- We add a \l MouseArea type to make the rectangle clickable by users:
+ Add a \l MouseArea type to make the rectangle clickable by users:
\printuntil anchors.fill
To check your code, you can compare it with the \e {Page.qml} example file.
- Next, we will make the image move between the rectangles when users click
- them, by adding states and by connecting mouse clicks to state changes.
+ Next, make the image move between the rectangles when users click
+ them by adding states and by connecting mouse clicks to state changes.
\section1 Connecting Mouse Clicks to State Changes
- To make the image move between the rectangles when users click them, we add
- states to the Page component, where we change the values of the \c x and
+ To make the image move between the rectangles when users click them, add
+ states to the Page component where you change the values of the \c x and
\c y properties of \e icon to match those of the middle right and top left
rectangles. To make sure that the image stays within the rectangle
- when the view is scaled on different sizes of screens, we \e bind the values
+ when the view is scaled on different sizes of screens, \e bind the values
of the \c x and \c y properties of \e icon to those of the rectangles:
\dots
\skipto states:
\printuntil ]
- Then, we connect the \c onClicked signals of the mouse areas to the state
+ Then, connect the \c onClicked signals of the mouse areas to the state
changes:
\quotefromfile transitions/Page.qml
\skipto Connections {
\printuntil }
- Because we develop with Qt 6, we must specify the connections as functions.
+ Because you develop with Qt 6, you must specify the connections as functions.
\section1 Adding Page to the Main View
- We now open \e main.qml for editing and add an instance of the Page custom
+ Open \e Main.qml for editing and add an instance of the Page custom
component to it:
\quotefromfile transitions/main.qml
@@ -157,18 +155,18 @@
\section1 Animating Transitions
- We will now create transitions to apply animation to the image. For example,
+ Create transitions to apply animation to the image. For example,
the image bounces back when it moves to \e middleRightRect and eases into
\e bottomLeftRect.
- We specify transitions for switching from each state to the other two
+ Specify transitions for switching from each state to the other two
states:
\quotefromfile transitions/Page.qml
\skipto transitions:
\printuntil },
- We change the easing curve type for transitions to \e State2 from linear to
+ Change the easing curve type for transitions to \e State2 from linear to
\c Easing.OutBounce to create the bounce effect:
\printuntil },
@@ -177,9 +175,9 @@
{Qt Quick Toolbar for animation} to specify the
easing curve type and animation duration.
- \image qml-toolbar-animation.png "Qt Quick Toolbar for animation"
+ \image qml-toolbar-animation.png {Qt Quick Toolbar for animation}
- Then, we change the easing curve type for transitions to \e State2 from
+ Then, change the easing curve type for transitions to \e State2 from
linear to \c Easing.InOutQuad to create the easing effect:
\printuntil /^\ {0}\}/
diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-tutorial-create-empty-project.qdocinc b/doc/qtcreator/src/qtquick/creator-only/qtquick-tutorial-create-empty-project.qdocinc
index d0a5b94cc07..8e439c3ce27 100644
--- a/doc/qtcreator/src/qtquick/creator-only/qtquick-tutorial-create-empty-project.qdocinc
+++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-tutorial-create-empty-project.qdocinc
@@ -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
/*!
@@ -17,37 +17,25 @@
\uicontrol {Project Location} dialog.
\li In the \uicontrol Name field, enter a name for the application.
- When naming your own projects, keep in mind that they cannot be
- easily renamed later.
+ When naming your own projects, keep in mind that you cannot
+ easily rename them later.
\li In the \uicontrol {Create in} field, enter the path for the project
files. You can move project folders later without problems.
- \li Select \uicontrol Next (or \uicontrol Continue on \macos) to open
- the \uicontrol {Define Build System} dialog.
-
- \li In the \uicontrol {Build system} field, select \l {Setting Up CMake}
- {CMake} as the build system to use for building and running the
- project.
-
- \note If you select \l {Setting Up Qbs}{Qbs}, the instructions for
- configuring the project won't apply.
-
\li Select \uicontrol Next to open the
\uicontrol {Define Project Details} dialog.
\image qtcreator-project-qt-quick-details.webp {Define Project Details dialog}
- \li In the \uicontrol {Minimum required Qt version} field, select
- Qt 6.4.
+ \li Deselect the \uicontrol {Create a project that you can open in \QDS}
+ check box.
- \note This tutorial shows you how to create the application in the
- \uicontrol Edit mode. If you select
- \uicontrol {Create a project that you can open in \QDS}, the
+ \note This tutorial shows how to create the application in the
+ \uicontrol Edit mode. If you leave the check box selected, the
following instructions won't apply.
- \li Select \uicontrol Next to use the default settings and to open
- the \uicontrol {Kit Selection} dialog.
+ \li Select \uicontrol Next to open the \uicontrol {Kit Selection} dialog.
\li Select Qt 6.4 or later \l{glossary-buildandrun-kit}{kits} for the
platforms that you want to build the application for. To build
diff --git a/doc/qtcreator/src/user-interface/creator-file-system-view.qdoc b/doc/qtcreator/src/user-interface/creator-file-system-view.qdoc
index b7eddea19a0..b2a9f0dfe1d 100644
--- a/doc/qtcreator/src/user-interface/creator-file-system-view.qdoc
+++ b/doc/qtcreator/src/user-interface/creator-file-system-view.qdoc
@@ -3,22 +3,29 @@
/*!
\page creator-file-system-view.html
+ \if defined(qtdesignstudio)
\previouspage creator-projects-view.html
\nextpage creator-open-documents-view.html
+ \else
+ \previouspage creator-reference.html
+ \endif
+
+ \ingroup creator-reference-sidebar-views
+ \ingroup studio-views
\title File System
- The \uicontrol {File System} view shows all the files in the file system.
+ \brief Shows all the files in the current directory.
+ \if defined(qtcreator)
\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)
- \image qtcreator-filesystem-view-design.png {File System view}
- \else
\image qtcreator-filesystem-view.webp {File System view in the sidebar}
+ \else
+ \image qtcreator-filesystem-view-design.png {File System view}
\endif
To move to the root directory of the file system, select \uicontrol Computer
diff --git a/doc/qtcreator/src/user-interface/creator-how-to-view-output.qdoc b/doc/qtcreator/src/user-interface/creator-how-to-view-output.qdoc
new file mode 100644
index 00000000000..a6e4746e7c8
--- /dev/null
+++ b/doc/qtcreator/src/user-interface/creator-how-to-view-output.qdoc
@@ -0,0 +1,86 @@
+// Copyright (C) 2023 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
+
+/*!
+ \page creator-how-to-view-output.html
+ \if defined(qtdesignstudio)
+ \previouspage creator-quick-tour.html
+ \nextpage creator-reference-application-output-view.html
+ \else
+ \previouspage creator-how-tos.html
+ \endif
+
+ \ingroup creator-how-to-ui
+
+ \title View output
+
+ The \e {output views} show output from several sources, such as a list of
+ errors and warnings encountered during a build, detailed output from the
+ compiler, status of a program when it is executed, debug output, or search
+ results.
+
+ \image qtcreator-output-panes-taskbar.webp {Output views}
+
+ You can open output views in all
+ \if defined (qtcreator)
+ \l{Switch between modes}{modes}
+ \else
+ modes
+ \endif in the following ways:
+
+ \list
+ \if defined(qtcreator)
+ \li Select the output view.
+ \endif
+ \li Select \uicontrol View > \uicontrol Output.
+ The menu items also display the \l{Keyboard Shortcuts}
+ {keyboard shortcuts} that you can use.
+ \li Select \key Alt (\key Cmd on \macos) and the number of the view.
+ \li Select \inlineimage icons/output-pane-menu.png
+ , and then select the view to open.
+ \endlist
+
+ To maximize an open output view, select the \inlineimage icons/arrowup.png
+ (\uicontrol Maximize) button or press \key {Alt+Shift+9}.
+
+ To increase or decrease the output text size, select \inlineimage icons/plus.png
+ (\uicontrol {Zoom In}) or \inlineimage icons/minus.png
+ (\uicontrol {Zoom Out}), or press \key Ctrl++ or \key Ctrl+-. Zooming is
+ not supported in all output views.
+
+ \section1 Change text encoding
+
+ 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 Edit >
+ \uicontrol Preferences > \uicontrol Environment > \uicontrol Interface, and
+ then select the codec in the \uicontrol {Text codec for tools} field.
+
+ \image qtcreator-preferences-environment-interface.webp {Interface tab in Environment preferences}
+
+ \section1 Find and filter output
+
+ To search from output, press \key {Ctrl+F} when the view is active. Enter
+ search criteria in the \uicontrol Find field. For more information, see
+ \l{Finding and Replacing}.
+
+ To filter output, enter a string in the \uicontrol Filter field.
+
+ To specify filtering options,
+ select the \inlineimage icons/magnifier.png {Filtering options menu}
+ button. You can filter output by using regular expressions or
+ case-sensitivity. Select \uicontrol {Show Non-matching Lines} to
+ hide the lines that match the filter.
+
+ Some output views do not support finding and filtering.
+
+ \if defined(qtcreator)
+ \sa {Output Views}
+ \else
+ \section1 Output views
+
+ The following views show output:
+
+ \annotatedlist studio-reference-output-views
+ \endif
+*/
diff --git a/doc/qtcreator/src/user-interface/creator-only/creator-how-to-show-and-hide-sidebars.qdoc b/doc/qtcreator/src/user-interface/creator-only/creator-how-to-show-and-hide-sidebars.qdoc
index d1a07de2cef..52ecb03c011 100644
--- a/doc/qtcreator/src/user-interface/creator-only/creator-how-to-show-and-hide-sidebars.qdoc
+++ b/doc/qtcreator/src/user-interface/creator-only/creator-how-to-show-and-hide-sidebars.qdoc
@@ -4,7 +4,7 @@
/*!
\page creator-how-to-show-and-hide-sidebars.html
\previouspage creator-how-tos.html
- \nextpage creator-known-issues.html
+
\ingroup creator-how-to-ui
\title Show and hide sidebars
@@ -31,4 +31,9 @@
\li To close a sidebar view, click \inlineimage icons/splitbutton_closetop.png
(\uicontrol {Close}).
\endlist
+
+ In some views, right-clicking opens a context menu that has functions
+ for managing the objects listed in the view.
+
+ \sa {Sidebar Views}
*/
diff --git a/doc/qtcreator/src/user-interface/creator-only/creator-how-to-switch-between-modes.qdoc b/doc/qtcreator/src/user-interface/creator-only/creator-how-to-switch-between-modes.qdoc
index a43cffc4f04..fb023f1f3c1 100644
--- a/doc/qtcreator/src/user-interface/creator-only/creator-how-to-switch-between-modes.qdoc
+++ b/doc/qtcreator/src/user-interface/creator-only/creator-how-to-switch-between-modes.qdoc
@@ -4,7 +4,7 @@
/*!
\page creator-how-to-switch-between-modes.html
\previouspage creator-how-tos.html
- \nextpage creator-known-issues.html
+
\ingroup creator-how-to-ui
\title Switch between modes
diff --git a/doc/qtcreator/src/user-interface/creator-only/creator-reference-sidebar-views.qdoc b/doc/qtcreator/src/user-interface/creator-only/creator-reference-sidebar-views.qdoc
new file mode 100644
index 00000000000..ef50387b4fc
--- /dev/null
+++ b/doc/qtcreator/src/user-interface/creator-only/creator-reference-sidebar-views.qdoc
@@ -0,0 +1,129 @@
+// Copyright (C) 2023 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
+
+/*!
+ \page creator-outline-view.html
+ \previouspage creator-reference.html
+ \ingroup creator-reference-sidebar-views
+
+ \title Outline
+
+ \brief Shows an overview of defined types and other symbols, as well as
+ their properties and hierarchy in a source file.
+
+ To move the code for types and symbols around in the source file, drag
+ them in the outline.
+
+ \image qtcreator-outline-view.png {Outline view}
+
+ \list
+ \li To see a complete list of all bindings, select
+ \inlineimage icons/filtericon.png
+ (\uicontrol {Filter Tree}) > \uicontrol {Show All Bindings}.
+ \li To sort types or symbols alphabetically, select
+ \inlineimage icons/sort_alphabetically.png
+ (\uicontrol {Sort Alphabetically}).
+ \li To stop the synchronization with the type or symbol selected in the
+ editor, deselect \inlineimage icons/linkicon.png
+ (\uicontrol {Synchronize with Editor}).
+ \endlist
+*/
+
+/*!
+ \page creator-class-view.html
+ \previouspage creator-reference.html
+ \ingroup creator-reference-sidebar-views
+
+ \title Class View
+
+ \brief Shows the class hierarchy of the currently open projects.
+
+ \image qtcreator-class-view.png {Class View}
+
+ \list
+ \li To organize the view by subprojects, click
+ \inlineimage icons/qtcreator-show-subprojects.png
+ (\uicontrol {Show Subprojects}).
+ \li To visit all parts of a namespace, double-click on the
+ namespace item multiple times.
+ \endlist
+*/
+
+/*!
+ \page creator-call-hierarchy-view.html
+ \previouspage creator-reference.html
+ \ingroup creator-reference-sidebar-views
+
+ \title Call Hierarchy
+
+ \brief 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}
+*/
+
+/*!
+ \page creator-type-hierarchy.html
+ \previouspage creator-reference.html
+ \ingroup creator-reference-sidebar-views
+
+ \title Type Hierarchy
+
+ \brief Shows the base classes and derived classes of a class.
+
+ To view type hierarchy of a class:
+
+ \list 1
+ \li Right-click a class in the code editor.
+ \li Select \uicontrol {Open Type Hierarchy} or press \key {Ctrl+Shift+T}.
+ \endlist
+
+ \image qtcreator-type-hierarchy-view.png {Type Hierarchy view}
+
+ To navigate in the type hierarchy:
+
+ \list
+ \li Double-click a class or select it.
+ \li Select \uicontrol {Open Type Hierarchy} in the context menu.
+ \endlist
+
+ The view highlights the previous class.
+
+ The definition of the selected class opens in the code editor. You
+ can also select \uicontrol {Open in Editor} in the context menu to open
+ it.
+*/
+
+/*!
+ \page creator-include-hierarchy-view.html
+ \previouspage creator-reference.html
+ \ingroup creator-reference-sidebar-views
+
+ \title Include Hierarchy
+
+ \brief Shows the files that the current file includes and those that include
+ the current file.
+
+ To view the include hierarchy of a file:
+
+ \list 1
+ \li Right-click a file in the editor.
+ \li Select \uicontrol {Open Include Hierarchy}
+ or press \key {Ctrl+Shift+I}.
+ \endlist
+
+ \image qtcreator-include-hierarchy-view.png {Include Hierarchy view}
+
+ To keep the view synchronized with the file currently open in the editor,
+ select \inlineimage icons/linkicon.png
+ (\uicontrol {Synchronize with Editor}).
+*/
diff --git a/doc/qtcreator/src/user-interface/creator-only/creator-reference-terminal-view.qdoc b/doc/qtcreator/src/user-interface/creator-only/creator-reference-terminal-view.qdoc
new file mode 100644
index 00000000000..abfae8ba8b2
--- /dev/null
+++ b/doc/qtcreator/src/user-interface/creator-only/creator-reference-terminal-view.qdoc
@@ -0,0 +1,111 @@
+// Copyright (C) 2023 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
+
+/*!
+ \page creator-reference-terminal-view.html
+ \previouspage creator-reference.html
+
+ \ingroup creator-reference-output-views
+
+ \title Terminal
+
+ \brief Opens a terminal.
+
+ When you select the \uicontrol {Run in Terminal} check box and run an
+ application or the \uicontrol {Open Terminal} button to open a terminal,
+ it opens as an output view.
+
+ To open the terminal in a separate window, select \uicontrol Edit >
+ \uicontrol Preferences > \uicontrol Terminal, and deselet the
+ \uicontrol {Use internal terminal} check box.
+
+ On Linux and \macos, you can set the terminal to open by selecting
+ \uicontrol Edit > \uicontrol Preferences >
+ \uicontrol Environment > \uicontrol System.
+
+ \image qtcreator-output-terminal.webp {Terminal pane}
+
+ \list
+ \li To clear the terminal, select \inlineimage icons/clean_pane_small.png
+ (\uicontrol Clear).
+
+ \li To close the current terminal, select \inlineimage icons/terminal-close.png
+ .
+
+ \li To open new terminals as tabs, select \inlineimage icons/terminal-create.png
+ .
+
+ \li To move between terminals, select the tabs or \inlineimage icons/arrowup.png
+ and \inlineimage icons/arrowdown.png
+ .
+
+ \li To select a word in a terminal, double-click it. To select the whole line,
+ triple-click it.
+
+ \li To open links in a browser, files in the editor, or folders in the
+ \l Projects view, hover the mouse over them, and press \key Ctrl.
+
+ \li To \l{Finding and Replacing}{search} through the output, press \key {Ctrl+F}.
+
+ \li To make the font larger or smaller, select the \inlineimage icons/plus.png
+ and \inlineimage icons/minus.png
+ buttons. You can also change the font size in terminal preferences.
+
+ \li To open terminal preferences, select \inlineimage icons/settings.png
+ (\uicontrol Configure).
+ \endlist
+
+ Most of the \QC keyboard shortcuts are disabled in the terminal, except the
+ ones for opening terminal preferences or the locator and quitting \QC. To
+ send the escape key to the terminal instead of closing the terminal, select
+ \uicontrol {Shift+Esc}. You can also specify that the escape key is sent to
+ the terminal in terminal preferences.
+
+ \section1 Terminal Preferences
+
+ To set preferences for the internal terminal, select \uicontrol Edit >
+ \uicontrol Preferences > \uicontrol Terminal, or select the
+ \uicontrol Configure button in the \uicontrol Terminal pane.
+
+ \image qtcreator-preferences-terminal.webp {Terminal tab in Preferences}
+
+ \table
+ \header
+ \li Option
+ \li Value
+ \row
+ \li \uicontrol {Use internal terminal}
+ \li Open the \uicontrol Terminal pane when you select
+ \uicontrol {Run in Terminal} or \uicontrol {Open Terminal}.
+ \row
+ \li \uicontrol {Send escape key to terminal}
+ \li Send the escape key to the terminal instead of closing the terminal.
+ \row
+ \li \uicontrol {Audible bell}
+ \li Play an audible bell when the a bell character is received.
+ \row
+ \li \uicontrol {Allow blinking cursor}
+ \li Allow the cursor to blink.
+ \row
+ \li \uicontrol {Font}
+ \li Select the \uicontrol {Font family} and \uicontrol Size for the text
+ in the terminal. You can also use the \inlineimage icons/plus.png
+ and \inlineimage icons/minus.png buttons in the \uicontrol Terminal
+ pane to change the font size.
+ \row
+ \li \uicontrol {Colors}
+ \li Set colors for the \uicontrol Terminal pane \uicontrol Foreground,
+ \uicontrol Background, \uicontrol Selection, and
+ \uicontrol {Find match}.
+ \row
+ \li \uicontrol {Default shell}
+ \li Set the full path to the default terminal executable in
+ \uicontrol {Shell path} and the arguments to pass to the shell
+ in \uicontrol {Shell arguments}.
+ \endtable
+
+ To use an existing color scheme, select \uicontrol {Load Theme}. To revert
+ color changes, select \uicontrol {Reset Theme}.
+
+ \sa {View output}
+*/
diff --git a/doc/qtcreator/src/user-interface/creator-only/creator-reference-to-do-entries-view.qdoc b/doc/qtcreator/src/user-interface/creator-only/creator-reference-to-do-entries-view.qdoc
new file mode 100644
index 00000000000..fb1b40f2633
--- /dev/null
+++ b/doc/qtcreator/src/user-interface/creator-only/creator-reference-to-do-entries-view.qdoc
@@ -0,0 +1,75 @@
+// Copyright (C) 2023 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
+
+/*!
+ \page creator-reference-to-do-entries-view.html
+ \previouspage creator-reference.html
+
+ \ingroup creator-reference-output-views
+
+ \title To-Do Entries
+
+ \brief Lists the BUG, FIXME, NOTE, TODO, and WARNING keywords from the
+ current file, from all project files, or from a subproject.
+
+ Click the icons on the toolbar to show only the selected
+ keywords.
+
+ \image qtcreator-to-do-entries.webp {To-Do Entries}
+
+ You can also open task list files generated by code scanning and
+ analysis tools in \l Issues. For more information, see
+ \l{Showing Task List Files in Issues}.
+
+ \section1 Enabling the To-Do Plugin
+
+ The Todo plugin is disabled by default. To enable it:
+
+ \list 1
+ \li Select \uicontrol Help > \uicontrol {About Plugins} >
+ \uicontrol Utilities > \uicontrol Todo.
+ \li Select \uicontrol OK.
+ \li Select \uicontrol {Restart Now} to restart \QC and load the plugin.
+ \endlist
+
+ \section1 To-Do Preferences
+
+ To add keywords, select \uicontrol Edit > \uicontrol Preferences >
+ \uicontrol {To-Do} > \uicontrol Add. Set an icon and a line background color
+ for the keyword.
+
+ \image qtcreator-todo-options.png {To-Do preferences}
+
+ \list
+
+ \li To change the icon and line background color of the selected keyword,
+ select \uicontrol Edit.
+
+ \li To remove the selected keyword, select \uicontrol Remove.
+
+ \li To reset the list to predefined keywords, select \uicontrol Reset.
+ All your changes will be permanently lost.
+
+ \li To determine whether the keywords in the whole project, in the
+ current file, or in a subproject are displayed by default, select
+ the appropriate option in the \uicontrol {Scanning scope} group.
+
+ \endlist
+
+ \section1 Excluding Files from Scanning
+
+ To exclude files from scanning, select \uicontrol {Project Settings} >
+ \uicontrol {To-Do} in the \uicontrol Projects mode.
+
+ \image qtcreator-todo-excluded-files.png {Excluded Files in To-Do preferences}
+
+ Select \uicontrol Add and double-click the placeholder text in
+ \uicontrol {Exclude Files} to enter a regular expression that
+ matches the path to files to exclude. Use a forward slash (/)
+ as a separator in the path also on Windows.
+
+ Select the link in \uicontrol {Use global settings} to open global
+ To-Do preferences.
+
+ \sa {Enable and disable plugins}
+*/
diff --git a/doc/qtcreator/src/user-interface/creator-open-documents-view.qdoc b/doc/qtcreator/src/user-interface/creator-open-documents-view.qdoc
index 47b6b3dd00e..0ad0967dc0c 100644
--- a/doc/qtcreator/src/user-interface/creator-open-documents-view.qdoc
+++ b/doc/qtcreator/src/user-interface/creator-open-documents-view.qdoc
@@ -1,20 +1,24 @@
-// Copyright (C) 2021 The Qt Company Ltd.
+// Copyright (C) 2023 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
/*!
\page creator-open-documents-view.html
- \previouspage creator-file-system-view.html
+
\if defined(qtdesignstudio)
+ \previouspage creator-file-system-view.html
\nextpage studio-content-library.html
\else
- \nextpage creator-output-panes.html
+ \previouspage creator-reference.html
\endif
+ \ingroup creator-reference-sidebar-views
+ \ingroup studio-views
+
\title Open Documents
- The \uicontrol {Open Documents} view displays a list of open documents.
+ \brief Shows currently open files.
- \image qtcreator-open-documents-view.png "Open Documents view"
+ \image qtcreator-open-documents-view.png {Open Documents view}
You can use the context menu to apply some of the functions also available
in the \uicontrol File menu and in the \l {File System Context Menu}
@@ -25,17 +29,17 @@
\list
\li Copy the full path of the file or just the filename to the
clipboard.
- \li Pin files to ensure they stay at the top of the list and are not
- closed when you select \uicontrol {Close All}.
+ \li Pin files to the top of the list to keep them open when you
+ select \uicontrol {Close All}.
\endlist
- \section1 Specifying Settings for Opening Files
+ \section1 Setting Preferences for Opening Files
- To specify settings for opening files and handling open files, select
+ To set preferences for opening files and handling open files, select
\uicontrol Edit > \uicontrol Preferences > \uicontrol Environment >
\uicontrol System:
- \image qtcreator-options-environment-system.png "Environment preferences System tab"
+ \image qtcreator-options-environment-system.png {System tab in Environment preferences}
\list
\li In the \uicontrol {When files are externally modified} field,
diff --git a/doc/qtcreator/src/user-interface/creator-projects-view.qdoc b/doc/qtcreator/src/user-interface/creator-projects-view.qdoc
index ef356c81cf4..529abfed348 100644
--- a/doc/qtcreator/src/user-interface/creator-projects-view.qdoc
+++ b/doc/qtcreator/src/user-interface/creator-projects-view.qdoc
@@ -5,28 +5,31 @@
\page creator-projects-view.html
\if defined(qtdesignstudio)
\previouspage qtquick-curve-editor.html
- \else
- \previouspage creator-views.html
- \endif
\nextpage creator-file-system-view.html
+ \else
+ \previouspage creator-reference.html
+ \endif
+
+ \ingroup creator-reference-sidebar-views
+ \ingroup studio-views
\title Projects
- The \uicontrol Projects view displays projects in a project tree.
+ \brief Shows a list of projects in a project tree.
+ \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
the build system structure of the project and lists all files that
are part of the project.
+ \image qtcreator-projects-view-edit.png {Projects view in the sidebar}
+
\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)
- \image qtcreator-projects-view-design.png {Projects view}
\else
- \image qtcreator-projects-view-edit.png {Projects view in the sidebar}
+ \image qtcreator-projects-view-design.png {Projects view}
\endif
You can use the project tree in the following ways:
diff --git a/doc/qtcreator/src/user-interface/creator-reference-output-views.qdoc b/doc/qtcreator/src/user-interface/creator-reference-output-views.qdoc
new file mode 100644
index 00000000000..011a4bdfee7
--- /dev/null
+++ b/doc/qtcreator/src/user-interface/creator-reference-output-views.qdoc
@@ -0,0 +1,276 @@
+// Copyright (C) 2023 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
+
+// **********************************************************************
+// NOTE: the sections are not ordered by their logical order to avoid
+// reshuffling the file each time the index order changes (i.e., often).
+// Run the fixnavi.pl script to adjust the links to the index order.
+// **********************************************************************
+
+/*!
+ \page creator-reference-issues-view.html
+ \if defined(qtdesignstudio)
+ \previouspage creator-reference-compile-output-view.html
+ \nextpage creator-reference-search-results-view.html
+ \else
+ \previouspage creator-reference.html
+ \endif
+
+ \ingroup creator-reference-output-views
+ \ingroup studio-reference-output-views
+
+ \title Issues
+
+ \brief Lists issues from different sources.
+
+ The \uicontrol Issues view filters out irrelevant output from the build tools
+ and presents the issues in an organized way.
+
+ To further filter the output by type, select \inlineimage icons/filtericon.png
+ (\uicontrol {Filter Tree}) and then select a filter:
+
+ \list
+
+ \if defined(qtdesignstudio)
+ \li \uicontrol {Asset Export} - Errors and warnings encountered
+ while exporting assets.
+
+ \li \uicontrol {Asset Importer Error} - Errors and warnings encountered
+ while importing assets from a design tool.
+ \else
+ \li \uicontrol Autotests - Errors and warnings encountered while running
+ tests.
+ \endif
+
+ \li \uicontrol {Build System} - Errors and warnings encountered when
+ opening and managing projects.
+
+ \if defined(qtcreator)
+ \li \uicontrol {Clang Code Model} -
+ \l {Parsing C++ Files with the Clang Code Model}
+ {Errors and warnings from the current editor}.
+ \li \uicontrol {Clang Tools} - Errors and warnings from
+ \l {Using Clang Tools}{Clang-Tidy and Clazy}
+ \endif
+
+ \li \uicontrol Compile - Selected output from the compiler. Open
+ \uicontrol {Compile Output} for more detailed information.
+
+ \li \uicontrol{Debug Information} - Lists debug information packages that might
+ be missing.
+
+ \if defined(qtcreator)
+ \li \uicontrol Debugger - Errors encountered while running the
+ \l{Analyzing Code}{Valgrind code analysis tools}.
+ \endif
+
+ \li \uicontrol{Debugger Runtime} - Errors encountered when starting \QC. For
+ example, information about missing DLLs.
+
+ \li \uicontrol Deployment - Errors encountered between building an application
+ successfully and starting it on a \l{glossary-device}{device}.
+
+ \if defined(qtcreator)
+ \li \uicontrol {My Tasks} - Entries from a task list file (.tasks) generated
+ by \l{Showing Task List Files in Issues}
+ {code scanning and analysis tools}.
+
+ \li \uicontrol Python - Runtime errors and exceptions of Python scripts.
+ \endif
+
+ \li \uicontrol QML and \uicontrol {QML Analysis} -
+ \l{JavaScript and QML Error Codes}
+ {QML and JavaScript syntax errors}.
+
+ \if defined(qtcreator)
+ \li \uicontrol Sanitizer - Tasks created when you run an application if
+ you used an \e {address sanitizer} to detect memory handling issues.
+ \endif
+ \endlist
+
+ To find output in the view, enter search criteria in the \uicontrol Filter
+ field.
+
+ \image qtcreator-issues.webp {Issues}
+
+ Select one or several lines to apply context-menu actions to their contents.
+ You can remove the selected lines or copy their contents to the clipboard.
+ For single lines, you can search the Internet for a solution using the
+ contents of the line as search criteria or open a version control
+ annotation view of the line that causes the error message.
+
+ To view detailed information about the selected line (where available), press
+ \key Space.
+
+ To navigate to the corresponding source code, click an issue or
+ select \uicontrol {Show in Editor} in the context menu. The entry must contain the
+ name of the file where the issue was found.
+
+ To view more information about an issue in \l {Compile Output},
+ select \uicontrol {Show Compile Output} in the context menu.
+
+ To jump from one issue to the next or previous
+ one, select \inlineimage icons/arrowup.png
+ and \inlineimage icons/arrowdown.png
+ or press \key F6 and \key Shift+F6.
+
+ By default, a new build clears the \uicontrol Issues view. To keep
+ the issues from the previous build rounds, deselect \uicontrol Edit >
+ \uicontrol Preferences > \uicontrol {Build & Run} > \uicontrol General >
+ \uicontrol {Clear issues list on new build}.
+*/
+
+/*!
+ \page creator-reference-search-results-view.html
+ \if defined(qtdesignstudio)
+ \previouspage creator-reference-issues-view.html
+ \else
+ \previouspage creator-reference.html
+ \endif
+
+ \ingroup creator-reference-output-views
+ \ingroup studio-reference-output-views
+
+ \title Search Results
+
+ \brief Lets you search through projects, files on a file system or the
+ currently open files.
+
+ The search history (1) stores the search results. You can select earlier
+ searches from the history.
+
+ \image qtcreator-search-results.webp {Search Results - criteria}
+
+ The figure below shows an example search result for all
+ occurrences of the search string in the specified directory.
+
+ \image qtcreator-search-results-matches.webp {Search Results - matches found}
+
+ For more information about the different search options, see
+ \l {Finding and Replacing}.
+*/
+
+/*!
+ \page creator-reference-application-output-view.html
+ \if defined(qtdesignstudio)
+ \previouspage creator-how-to-view-output.html
+ \nextpage creator-reference-compile-output-view.html
+ \else
+ \previouspage creator-reference.html
+ \endif
+
+ \ingroup creator-reference-output-views
+ \ingroup studio-reference-output-views
+
+ \title Application Output
+
+ \brief Displays the status of a program when you execute it, and the debug
+ output.
+
+ \image qtcreator-application-output.webp {Application Output}
+
+ \if defined(qtcreator)
+ If you specify command line arguments in the run settings that are passed
+ to the application when running it, they are displayed as a part of the
+ application output. For more information, see
+ \l{Specifying Run Settings for Desktop Device Types}.
+ \endif
+
+ Select toolbar buttons to run applications, to attach the debugger to the
+ running application, and to stop running or debugging.
+
+ \section1 Application Output Preferences
+
+ To set preferences for displaying application output:
+
+ \list
+ \li Select \uicontrol Edit > \uicontrol Preferences >
+ \uicontrol {Build & Run} > \uicontrol {Application Output}.
+ \li Select the \inlineimage icons/settings.png
+ (\uicontrol {Open Settings Page}) button.
+ \endlist
+
+ \image qtcreator-preferences-application-output.webp {Application Output tab in Preferences}
+
+ You can select whether to open \uicontrol{Application Output} on output when
+ running or debugging applications, to clear old output on a new run,
+ to word-wrap output, and to limit output to the specified number of lines.
+*/
+
+/*!
+ \page creator-reference-compile-output-view.html
+ \if defined(qtdesignstudio)
+ \previouspage creator-reference-application-output-view.html
+ \nextpage creator-reference-issues-view.html
+ \else
+ \previouspage creator-reference.html
+ \endif
+
+ \ingroup creator-reference-output-views
+ \ingroup studio-reference-output-views
+
+ \title Compile Output
+
+ \brief Shows all output from the compiler.
+
+ \uicontrol{Compile Output} shows a more detailed version of information
+ displayed in \l Issues.
+
+ \image qtcreator-compile-output.webp {Compile Output}
+
+ Double-click a file name in an error message to open the file in the
+ code editor.
+
+ To cancel the build, select the \uicontrol {Cancel Build} button.
+
+ To copy the output to the clipboard, select \uicontrol {Select All} in the
+ context menu, and then select \uicontrol Copy. Save the output as a file if
+ you want to examine it later without having to build the project again.
+ This is useful for large projects that take a long time to build.
+
+ \section1 Compile Output Preferences
+
+ To specify whether to open the \uicontrol {Compile Output} view on output
+ when building applications:
+
+ \list 1
+ \li Open the preferences:
+ \list
+ \li In the \uicontrol {Compile Output} view,
+ select \inlineimage icons/settings.png
+ (\uicontrol {Open Settings Page}).
+ \li Select \uicontrol Edit > \uicontrol Preferences >
+ \uicontrol {Build & Run} > \uicontrol {Compile Output}.
+ \endlist
+ \image qtcreator-preferences-compile-output.webp {Compile Output tab in Preferences}
+ \li Select the \uicontrol {Open Compile Output when building} check box.
+ \li In the \uicontrol {Limit output to} field, you can specify the
+ maximum amount of build output lines to display.
+ \endlist
+
+ \section1 Parsing Existing Compile Output
+
+ You can use \QC's output parsers to parse output from builds done outside
+ of \QC or stored from previous build runs. By default, the parsers from the
+ kit selected for the active project are used, but you can select another
+ kit.
+
+ To parse compile output:
+
+ \list 1
+ \li Select \uicontrol Tools > \uicontrol {Parse Build Output}.
+ \image qtcreator-parse-build-output.png
+ \li Paste the build output in the \uicontrol {Build Output} field, or
+ select \uicontrol {Load from File} to load it from a file.
+ \li Deselect the \uicontrol {Output went to stderr} check box if the
+ parser expects issues on \c stdout.
+ \li In the \uicontrol {Use parsers from kit} field, select the kit to
+ use for parsing the output. Select \uicontrol Manage to view
+ and modify kit settings.
+ \li The parser displays the parsed output in \l Issues. By default, the
+ view is cleared before adding the new output.
+ Deselect the \uicontrol {Clear existing tasks} check box to append
+ the new output to the old output.
+ \li Select \uicontrol OK to start parsing.
+ \endlist
+*/
diff --git a/doc/qtcreator/src/user-interface/creator-ui.qdoc b/doc/qtcreator/src/user-interface/creator-ui.qdoc
index 29fe61bb26b..220d9af132a 100644
--- a/doc/qtcreator/src/user-interface/creator-ui.qdoc
+++ b/doc/qtcreator/src/user-interface/creator-ui.qdoc
@@ -1,12 +1,6 @@
// Copyright (C) 2023 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
-// **********************************************************************
-// NOTE: the sections are not ordered by their logical order to avoid
-// reshuffling the file each time the index order changes (i.e., often).
-// Run the fixnavi.pl script to adjust the links to the index order.
-// **********************************************************************
-
/*!
\page creator-quick-tour.html
\if defined(qtdesignstudio)
@@ -14,7 +8,7 @@
\nextpage creator-using-qt-quick-designer.html
\else
\previouspage creator-overview.html
- \nextpage creator-views.html
+ \nextpage creator-configuring.html
\endif
\title User Interface
@@ -66,7 +60,7 @@
\li \inlineimage numbers/07.png
\li Output
\li View output from building, running, and other actions.
- \li \l{Viewing Output}
+ \li \l{View output}
\endtable
To see where the above controls are in the UI, select
@@ -82,8 +76,7 @@
For information about new features and bug fixes in each \QC release,
select \uicontrol Help > \uicontrol {Change Log}.
- \sa {Show and hide sidebars}, {Browsing Project Contents}
- \sa {Use the UI}{How-to: Use the UI}
+ \sa {Use the UI}{How-to: Use the UI}, {Reference}
\else
@@ -128,6 +121,7 @@
\li \l {Find menu items on \macos}
\li \l {Set high DPI scaling}
\li \l {Switch UI themes}
+ \li \l {View output}
\endlist
\section1 Viewing Images
@@ -141,465 +135,3 @@
\endif
*/
-
-/*!
- \page creator-output-panes.html
- \if defined(qtdesignstudio)
- \previouspage creator-views.html
- \nextpage creator-highlighting.html
- \else
- \previouspage creator-open-documents-view.html
- \nextpage creator-configuring.html
- \endif
-
- \title Viewing Output
-
- \image qtcreator-general-messages.webp {General Messages}
-
- You can view the following types of output:
-
- \list
-
- \li \l {Issues}
-
- \li \l {Search Results}
-
- \li \l {Application Output}
-
- \li \l {Compile Output}
-
- \if defined(qtcreator)
- \li \l {Terminal}
- \endif
-
- \li \uicontrol {QML Debugger Console}
-
- \li \uicontrol{General Messages}
-
- \if defined(qtcreator)
- \li \l {Static Code Analysis}{Axivion}
- \endif
-
- \li \uicontrol{Version Control}
-
- \if defined(qtcreator)
- \li \l{Running Autotests}{Test Results}
-
- \li \l{Using Squish}{Squish} test results and Squish Server and
- Runner logs
-
- \li \l {To-Do Entries}
-
- \endif
-
- \endlist
-
- Output is available on the taskbar in all
- \if defined(qtcreator)
- \l{Switch between modes}{modes}.
- \else
- \l{Mode}{modes}.
- \endif
-
- \image qtcreator-output-panes-taskbar.webp "Output on the taskbar"
-
- You can view output in the following ways:
-
- \list
- \li Select the output view on the taskbar.
- \li Select \key Alt (\key Cmd on \macos) and the number of the view on
- the taskbar.
- \li Select \inlineimage icons/output-pane-menu.png
- , and then select the view to open.
- \li Select \uicontrol View > \uicontrol Output.
- The menu items also display the \l{Keyboard Shortcuts}
- {keyboard shortcuts} that you can use.
- \endlist
-
- To maximize an open output view, select the \inlineimage icons/arrowup.png
- (\uicontrol Maximize) button or press \key {Alt+Shift+9}.
-
-
- To increase or decrease the output text size, select \inlineimage icons/plus.png
- (\uicontrol {Zoom In}) or \inlineimage icons/minus.png
- (\uicontrol {Zoom Out}), or press \key Ctrl++ or \key Ctrl+-. Zooming is
- not supported in all output views.
-
- To open the \uicontrol{General Messages} and
- \if defined(qtcreator)
- \l{Using Version Control Systems}{Version Control}
- \else
- \l{Using Git}{Version Control}
- \endif
- views, select \uicontrol View > \uicontrol Output.
- \if defined(qtcreator)
- To view \uicontrol {To-Do Entries}, enable the \uicontrol Todo plugin.
- \endif
-
- For more information about the \uicontrol {QML Debugger Console} view, see
- \l{Executing JavaScript Expressions}.
-
- 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 Edit >
- \uicontrol Preferences > \uicontrol Environment > \uicontrol Interface, and
- then select the codec in the \uicontrol {Text codec for tools} field.
-
- \image qtcreator-preferences-environment-interface.webp {Interface tab in Environment preferences}
-
- \section1 Finding and Filtering Output
-
- To search from output, press \key {Ctrl+F} when the view is active. Enter
- search criteria in the \uicontrol Find field. For more information, see
- \l{Finding and Replacing}.
-
- Besides searching from the output, you can enter a string in the
- \uicontrol Filter field to filter it. To specify filtering options,
- select the \inlineimage icons/magnifier.png "Filtering options menu"
- button. You can filter output by using regular expressions or
- case-sensitivity. Select \uicontrol {Show Non-matching Lines} to
- hide the lines that match the filter.
-
- Finding and filtering are not supported in all output views.
-
- \section1 Issues
-
- \uicontrol{Issues} lists the following types of issues:
-
- \list
-
- \if defined(qtdesignstudio)
- \li \uicontrol {Asset Export} - Errors and warnings encountered
- while exporting assets.
-
- \li \uicontrol {Asset Importer Error} - Errors and warnings encountered
- while importing assets from a design tool.
- \else
- \li \uicontrol Autotests - Errors and warnings encountered while running
- tests.
- \endif
-
- \li \uicontrol {Build System} - Errors and warnings encountered during a
- build.
-
- \if defined(qtcreator)
- \li \uicontrol {Clang Code Model} -
- \l {Parsing C++ Files with the Clang Code Model}
- {Errors and warnings from the current editor}.
- \li \uicontrol {Clang Tools} - Errors and warnings from
- \l {Using Clang Tools}{Clang-Tidy and Clazy}
- \endif
-
- \li \uicontrol Compile - Selected output from the compiler. Open
- \uicontrol {Compile Output} for more detailed information.
-
- \li \uicontrol{Debug Information} - Lists debug information packages that might
- be missing.
-
- \if defined(qtcreator)
- \li \uicontrol Debugger - Errors encountered while running the
- \l{Analyzing Code}{Valgrind code analysis tools}.
- \endif
-
- \li \uicontrol{Debugger Runtime} - Errors encountered when starting \QC. For
- example, information about missing DLLs.
-
- \li \uicontrol Deployment - Errors encountered between building an application
- successfully and starting it on a \l{glossary-device}{device}.
-
- \if defined(qtcreator)
- \li \uicontrol {My Tasks} - Entries from a task list file (.tasks) generated
- by \l{Showing Task List Files in Issues}
- {code scanning and analysis tools}.
-
- \li \uicontrol Python - Runtime errors and exceptions of Python scripts.
- \endif
-
- \li \uicontrol QML and \uicontrol {QML Analysis} -
- \l{JavaScript and QML Error Codes}
- {QML and JavaScript syntax errors}.
-
- \if defined(qtcreator)
- \li \uicontrol Sanitizer - Tasks created when you run an application if
- you used an \e {address sanitizer} to detect memory handling issues.
- \endif
- \endlist
-
- The view filters out irrelevant output from the build tools and presents the
- issues in an organized way. To further filter the output by type, select
- \inlineimage icons/filtericon.png
- (\uicontrol {Filter Tree}) and then select a filter. To find output in the
- view, enter search criteria in the \uicontrol Filter field.
-
- \image qtcreator-issues.webp {Issues}
-
- Select one or several lines to apply context-menu actions to their contents.
- You can remove the selected lines or copy their contents to the clipboard.
- For single lines, you can search the Internet for a solution using the
- contents of the line as search criteria or open a version control
- annotation view of the line that causes the error message.
-
- To view detailed information about the selected line (where available), press
- \key Space.
-
- To navigate to the corresponding source code, click an issue or
- select \uicontrol {Show in Editor} in the context menu. The entry must contain the
- name of the file where the issue was found.
-
- To view more information about an issue in \l {Compile Output},
- select \uicontrol {Show Compile Output} in the context menu.
-
- To jump from one issue to the next or previous
- one, select \inlineimage icons/arrowup.png
- and \inlineimage icons/arrowdown.png
- or press \key F6 and \key Shift+F6.
-
- By default, a new build clears the \uicontrol Issues view. To keep
- the issues from the previous build rounds, deselect \uicontrol Edit >
- \uicontrol Preferences > \uicontrol {Build & Run} > \uicontrol General >
- \uicontrol {Clear issues list on new build}.
-
- \section1 Search Results
-
- In \uicontrol{Search Results}, you can search through projects, files on
- a file system or the currently open files:
-
- \image qtcreator-search-results.webp {Search Results - criteria}
-
- The search history (1) stores the search results. You can select earlier
- searches from the history.
-
- The figure below shows an example search result for all
- occurrences of the search string in the specified directory.
-
- \image qtcreator-search-results-matches.webp {Search Results - matches found}
-
- For more information about the different search options, see
- \l {Finding and Replacing}.
-
- \section1 Application Output
-
- \uicontrol{Application Output} displays the status of a program when
- you execute it, and the debug output.
-
- \image qtcreator-application-output.webp {Application Output}
-
- \if defined(qtcreator)
- If you specify command line arguments in the run settings that are passed
- to the application when running it, they are displayed as a part of the
- application output. For more information, see
- \l{Specifying Run Settings for Desktop Device Types}.
- \endif
-
- Select toolbar buttons to run applications, to attach the debugger to the
- running application, and to stop running or debugging.
-
- To specify settings for displaying application output, select
- \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
- applications, to clear old output on a new run,
- to word-wrap output, and to limit output to the specified number of lines.
-
- \section1 Compile Output
-
- \uicontrol{Compile Output} shows all output from the compiler.
- The \uicontrol{Compile Output} is a more detailed version of information
- displayed in \l Issues.
-
- \image qtcreator-compile-output.webp {Compile Output}
-
- Double-click on a file name in an error message to open the file in the
- code editor.
-
- 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 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
- amount of build output lines to display.
-
- You can also open the preferences page by clicking \inlineimage icons/settings.png
- (\uicontrol {Open Settings Page}).
-
- To copy the output to the clipboard, select \uicontrol {Select All} in the
- context menu, and then select \uicontrol Copy. Save the output as a file if
- you want to examine it later without having to build the project again.
- This is useful for large projects that take a long time to build.
-
- \section2 Parsing Existing Compile Output
-
- You can use \QC's output parsers to parse output from builds done outside
- of \QC or stored from previous build runs. By default, the parsers from the
- kit selected for the active project are used, but you can select another
- kit.
-
- To parse compile output:
-
- \list 1
- \li Select \uicontrol Tools > \uicontrol {Parse Build Output}.
- \image qtcreator-parse-build-output.png
- \li Paste the build output in the \uicontrol {Build Output} field, or
- select \uicontrol {Load from File} to load it from a file.
- \li Deselect the \uicontrol {Output went to stderr} check box if the
- parser expects issues on \c stdout.
- \li In the \uicontrol {Use parsers from kit} field, select the kit to
- use for parsing the output. Select \uicontrol Manage to view
- and modify kit settings.
- \li The parser displays the parsed output in \l Issues. By default, the
- view is cleared before adding the new output.
- Deselect the \uicontrol {Clear existing tasks} check box to append
- the new output to the old output.
- \li Select \uicontrol OK to start parsing.
- \endlist
-
- \if defined(qtcreator)
-
- \section1 Terminal
-
- When you select the \uicontrol {Run in Terminal} check box and run an
- application or the \uicontrol {Open Terminal} button to open a terminal,
- the default terminal opens. On Linux and \macos, you can set the default
- terminal by selecting \uicontrol Edit > \uicontrol Preferences >
- \uicontrol Environment > \uicontrol System.
-
- To open the terminal on the taskbar instead of in a separate window, select
- \uicontrol Edit > \uicontrol Preferences > \uicontrol Terminal >
- \uicontrol {Use internal terminal}.
-
- \image qtcreator-output-terminal.webp {Terminal pane}
-
- To clear the terminal, select \inlineimage icons/clean_pane_small.png
- (\uicontrol Clear).
-
- To close the current terminal, select \inlineimage icons/terminal-close.png
- .
-
- To open new terminals as tabs, select \inlineimage icons/terminal-create.png
- .
-
- To move between terminals, select the tabs or \inlineimage icons/arrowup.png
- and \inlineimage icons/arrowdown.png
- .
-
- To select a word in a terminal, double-click it. To select the whole line,
- triple-click it.
-
- To open links in a browser, files in the editor, or folders in the
- \l Projects view, hover the mouse over them, and press \key Ctrl.
-
- To \l{Finding and Replacing}{search} through the output, press \key {Ctrl+F}.
-
- To make the font larger or smaller, select the \inlineimage icons/plus.png
- and \inlineimage icons/minus.png
- buttons. You can also change the font size in terminal preferences.
-
- To open terminal preferences, select \inlineimage icons/settings.png
- (\uicontrol Configure).
-
- Most of the \QC keyboard shortcuts are disabled in the terminal, except the
- ones for opening terminal preferences or the locator and quitting \QC. To
- send the escape key to the terminal instead of closing the terminal, select
- \uicontrol {Shift+Esc}. You can also specify that the escape key is sent to
- the terminal in terminal preferences.
-
- \section2 Setting Terminal Preferences
-
- To set preferences for the internal terminal, select \uicontrol Edit >
- \uicontrol Preferences > \uicontrol Terminal, or select the
- \uicontrol Configure button in the \uicontrol Terminal pane.
-
- \image qtcreator-preferences-terminal.webp {Terminal tab in Preferences}
-
- \table
- \header
- \li Option
- \li Value
- \row
- \li \uicontrol {Use internal terminal}
- \li Open the \uicontrol Terminal pane when you select
- \uicontrol {Run in Terminal} or \uicontrol {Open Terminal}.
- \row
- \li \uicontrol {Send escape key to terminal}
- \li Send the escape key to the terminal instead of closing the terminal.
- \row
- \li \uicontrol {Audible bell}
- \li Play an audible bell when the a bell character is received.
- \row
- \li \uicontrol {Allow blinking cursor}
- \li Allow the cursor to blink.
- \row
- \li \uicontrol {Font}
- \li Select the \uicontrol {Font family} and \uicontrol Size for the text
- in the terminal. You can also use the \inlineimage icons/plus.png
- and \inlineimage icons/minus.png buttons in the \uicontrol Terminal
- pane to change the font size.
- \row
- \li \uicontrol {Colors}
- \li Set colors for the \uicontrol Terminal pane \uicontrol Foreground,
- \uicontrol Background, \uicontrol Selection, and
- \uicontrol {Find match}.
- \row
- \li \uicontrol {Default shell}
- \li Set the full path to the default terminal executable in
- \uicontrol {Shell path} and the arguments to pass to the shell
- in \uicontrol {Shell arguments}.
- \endtable
-
- To use an existing color scheme, select \uicontrol {Load Theme}. To revert
- color changes, select \uicontrol {Reset Theme}.
-
- \section1 To-Do Entries
-
- \uicontrol {To-Do Entries} lists the BUG, FIXME, NOTE, TODO, and
- WARNING keywords from the current file, from all project files, or from a
- subproject. Click the icons on the toolbar to show only the selected
- keywords.
-
- \image qtcreator-to-do-entries.webp {To-Do Entries}
-
- To add keywords, select \uicontrol Edit > \uicontrol Preferences >
- \uicontrol {To-Do} > \uicontrol Add. Set an icon and a line background color
- for the keyword.
-
- \image qtcreator-todo-options.png {To-Do preferences}
-
- To change the icon and line background color of the selected keyword, select
- \uicontrol Edit.
-
- To remove the selected keyword, select \uicontrol Remove.
-
- To reset the list to predefined keywords, select \uicontrol Reset. All your
- changes will be permanently lost.
-
- To determine whether the keywords in the whole project, in the current file,
- or in a subproject are displayed by default, select the appropriate option
- in the \uicontrol {Scanning scope} group.
-
- To exclude files from scanning, select \uicontrol {Project Settings} >
- \uicontrol {To-Do} in the \uicontrol Projects mode.
-
- \image qtcreator-todo-excluded-files.png {Excluded Files in To-Do preferences}
-
- Select \uicontrol Add and double-click the placeholder text in
- \uicontrol {Exclude Files} to enter a regular expression that
- matches the path to files to exclude. Use a forward slash (/)
- as a separator in the path also on Windows.
-
- Select the link in \uicontrol {Use global settings} to open global
- To-Do preferences.
-
- The Todo plugin is disabled by default. To enable the plugin, select
- \uicontrol Help > \uicontrol {About Plugins} > \uicontrol Utilities >
- \uicontrol Todo. Then select \uicontrol {Restart Now} to restart \QC
- and load the plugin.
-
- In addition, you can open task list files generated by code scanning and
- analysis tools in \l Issues. For more information, see
- \l{Showing Task List Files in Issues}.
- \endif
-
-*/
diff --git a/doc/qtcreator/src/user-interface/creator-views.qdoc b/doc/qtcreator/src/user-interface/creator-views.qdoc
deleted file mode 100644
index 673e902736d..00000000000
--- a/doc/qtcreator/src/user-interface/creator-views.qdoc
+++ /dev/null
@@ -1,148 +0,0 @@
-// Copyright (C) 2023 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
-
-/*!
- \page creator-views.html
- \if defined(qtdesignstudio)
- \previouspage creator-coding-navigating.html
- \nextpage creator-output-panes.html
- \else
- \previouspage creator-quick-tour.html
- \nextpage creator-projects-view.html
- \endif
-
- \title Browsing Project Contents
-
- \if defined(qtdesignstudio)
- You can organize \QDS views as \l {Managing Workspaces}{workspaces}.
- \else
- You can organize \QC views in \l {Show and hide sidebars}{sidebars} or as
- workspaces, depending on the \l{Switch between modes}{mode} you are working
- in. Only views that are relevant to a mode are available in it.
- \endif
-
- \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
- \li \l Projects shows a list of projects open in the current
- session and the project files needed by the build system.
- \li \l{File System} shows all files in the currently selected
- directory.
- \li \l{Open Documents} shows currently open files.
- \li \l{Using Bookmarks}{Bookmarks} shows all bookmarks for the current
- session.
- \li \l{Working with Branches}{Git Branches} shows the local and remote
- branches for the project in the Git version control system.
- \li \l{Viewing Defined Types and Symbols}{Outline} shows an overview of
- defined types and other symbols, as well as their properties and
- hierarchy in a source file.
- \endlist
-
- \if defined(qtcreator)
- The following views display additional information about C++ code:
-
- \list
- \li \l{Viewing the Class Hierarchy}{Class View} shows the class
- hierarchy of the currently open projects.
- \li \l{Running Autotests}{Tests} lists autotests and Qt Quick
- tests in the project.
- \li \l{Viewing Type Hierarchy}{Type Hierarchy} shows the base
- classes of a class.
- \li \l{Viewing Include Hierarchy}{Include Hierarchy} shows the
- files that the current file includes and those that include
- the current file.
- \endlist
- \else
- For more information about views that are only available when editing QML
- files in the \uicontrol Design mode, see \l{Design Views}.
- \endif
-
- The following sections describe the additional options in a particular view.
-
- 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
-
- The \uicontrol Outline view shows an overview of defined types and other
- symbols, as well as their properties and hierarchy in a source file.
- You can move the code for types and symbols around in the source file
- by dragging and dropping them in the outline.
-
- \image qtcreator-outline-view.png "Outline view"
-
- \list
- \li To see a complete list of all bindings, select
- \inlineimage icons/filtericon.png
- (\uicontrol {Filter Tree}) > \uicontrol {Show All Bindings}.
- \li To sort types or symbols alphabetically, select
- \inlineimage icons/sort_alphabetically.png
- (\uicontrol {Sort Alphabetically}).
- \li To stop the synchronization with the type or symbol selected in the
- editor, deselect \inlineimage icons/linkicon.png
- (\uicontrol {Synchronize with Editor}).
- \endlist
-
- \if defined(qtcreator)
- \section1 Viewing the Class Hierarchy
-
- The \uicontrol {Class View} shows the class hierarchy of the currently
- open projects.
-
- \image qtcreator-class-view.png "Class View"
-
- To organize the view by subprojects, click
- \inlineimage icons/qtcreator-show-subprojects.png
- (\uicontrol {Show Subprojects}).
-
- 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
- class in the code editor and select \uicontrol {Open Type Hierarchy} or
- press \key {Ctrl+Shift+T}.
-
- \image qtcreator-type-hierarchy-view.png "Type Hierarchy view"
-
- To navigate in the type hierarchy, double-click a class or select it,
- and then select \uicontrol {Open Type Hierarchy} in the context menu.
- The view highlights the previous class.
-
- The definition of the selected class opens in the code editor. You
- can also select \uicontrol {Open in Editor} in the context menu to open
- it.
-
- \section1 Viewing Include Hierarchy
-
- To view the files that the current file includes and those that include
- the current file, right-click in the editor and select
- \uicontrol {Open Include Hierarchy} or press \key {Ctrl+Shift+I}.
-
- \image qtcreator-include-hierarchy-view.png "Include Hierarchy view"
-
- To keep the view synchronized with the file currently open in the editor,
- select \inlineimage icons/linkicon.png
- (\uicontrol {Synchronize with Editor}).
- \endif
-*/
diff --git a/doc/qtcreator/src/vcs/creator-only/creator-vcs-gitlab.qdoc b/doc/qtcreator/src/vcs/creator-only/creator-vcs-gitlab.qdoc
index 52968f5b949..c458d5d0079 100644
--- a/doc/qtcreator/src/vcs/creator-only/creator-vcs-gitlab.qdoc
+++ b/doc/qtcreator/src/vcs/creator-only/creator-vcs-gitlab.qdoc
@@ -20,7 +20,7 @@
To use GitLab, you must create a connection to the GitLab server and clone
the projects you want to work on. You can also link previously cloned
projects to GitLab in the project settings. This enables you to receive
- event notifications in the \l {Viewing Output}{Version Control} pane.
+ event notifications in the \l {View output}{Version Control} pane.
\section1 Connecting to GitLab Servers
diff --git a/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc b/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc
index ad38116dffb..d7cdd609455 100644
--- a/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc
+++ b/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc
@@ -1,19 +1,17 @@
// Copyright (C) 2023 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
-// **********************************************************************
-// NOTE: the sections are not ordered by their logical order to avoid
-// reshuffling the file each time the index order changes (i.e., often).
-// Run the fixnavi.pl script to adjust the links to the index order.
-// **********************************************************************
-
/*!
- \previouspage {Creating a Qt Quick Application}
\page creator-writing-program.html
- \nextpage {Creating a Mobile Application}
+ \previouspage creator-tutorials.html
+ \nextpage creator-project-managing.html
+ \ingroup creator-tutorials
\title Creating a Qt Widget Based Application
+ \brief How to use the integrated \QD to create a Qt widget based application
+ for the desktop.
+
This tutorial describes how to use \QC to create a small Qt application,
Text Finder. It is a simplified version of the Qt UI Tools \l{Text Finder}
example. You'll use \QD to construct the application user interface from
@@ -29,11 +27,11 @@
\uicontrol {Application (Qt)} > \uicontrol {Qt Widgets Application}
> \uicontrol Choose.
- \image qtcreator-new-qt-gui-application.png "New Project dialog"
+ \image qtcreator-new-qt-gui-application.png {New Project dialog}
- The \uicontrol{Introduction and Project Location} dialog opens.
+ The \uicontrol{Project Location} dialog opens.
- \image qtcreator-intro-and-location-qt-gui.png "Introduction and Project Location dialog"
+ \image qtcreator-intro-and-location-qt-gui.png {Project Location dialog}
\li In the \uicontrol{Name} field, type \b {TextFinder}.
@@ -44,7 +42,7 @@
\uicontrol Continue (on \macos) to open the
\uicontrol {Define Build System} dialog.
- \image qtcreator-new-project-build-system-qt-gui.png "Define Build System dialog"
+ \image qtcreator-new-project-build-system-qt-gui.png {Define Build System dialog}
\li In the \uicontrol {Build system} field, select \l {Setting Up CMake}
{CMake} as the build system to use for building the project.
@@ -52,7 +50,7 @@
\li Select \uicontrol Next or \uicontrol Continue to open the
\uicontrol{Class Information} dialog.
- \image qtcreator-class-info-qt-gui.png "Class Information dialog"
+ \image qtcreator-class-info-qt-gui.png {Class Information dialog}
\li In the \uicontrol{Class name} field, type \b {TextFinder} as the class
name.
@@ -66,7 +64,7 @@
\li Select \uicontrol Next or \uicontrol Continue to open the
\uicontrol {Translation File} dialog.
- \image qtcreator-new-qt-gui-application-translationfile.png "Translation File dialog"
+ \image qtcreator-new-qt-gui-application-translationfile.png {Translation File dialog}
\li In the \uicontrol Language field, you can select a language that you
plan to \l {Using Qt Linguist}{translate} the application to. This
@@ -76,7 +74,7 @@
\li Select \uicontrol Next or \uicontrol Continue to open the
\uicontrol {Kit Selection} dialog.
- \image qtcreator-new-project-qt-versions-qt-gui.png "Kit Selection dialog"
+ \image qtcreator-new-project-qt-versions-qt-gui.png {Kit Selection dialog}
\li Select build and run \l{glossary-buildandrun-kit}{kits} for your
project.
@@ -84,7 +82,7 @@
\li Select \uicontrol Next or \uicontrol Continue to open the
\uicontrol {Project Management} dialog.
- \image qtcreator-new-project-summary-qt-gui.png "Project Management dialog"
+ \image qtcreator-new-project-summary-qt-gui.png {Project Management dialog}
\li Review the project settings, and select \uicontrol{Finish} (on Windows and
Linux) or \uicontrol Done (on \macos) to create the project.
@@ -106,7 +104,7 @@
\endlist
- \image qtcreator-textfinder-contents.png "TextFinder project contents"
+ \image qtcreator-textfinder-contents.png {TextFinder project contents}
The .h and .cpp files come with the necessary boiler plate code.
@@ -120,14 +118,14 @@
\section2 Designing the User Interface
- \image qtcreator-textfinder-ui.png "Text Finder UI"
+ \image qtcreator-textfinder-ui.png {Text Finder UI}
\list 1
\li In the \uicontrol{Editor} mode, double-click the textfinder.ui file in the
\uicontrol{Projects} view to launch the integrated \QD.
- \li Drag and drop the following widgets to the form:
+ \li Drag the following widgets to the form:
\list
@@ -137,13 +135,13 @@
\endlist
- \image qtcreator-textfinder-ui-widgets.png "Adding widgets to Text Finder UI"
+ \image qtcreator-textfinder-ui-widgets.png {Adding widgets to Text Finder UI}
\note To easily locate the widgets, use the search box at the top of the
\uicontrol Sidebar. For example, to find the \uicontrol Label widget, start typing
the word \b label.
- \image qtcreator-textfinder-filter.png "Filter field"
+ \image qtcreator-textfinder-filter.png {Filter field}
\li Double-click the \uicontrol{Label} widget and enter the text
\b{Keyword}.
@@ -154,21 +152,21 @@
\li In the \uicontrol Properties view, change the \uicontrol objectName to
\b findButton.
- \image qtcreator-textfinder-objectname.png "Changing object names"
+ \image qtcreator-textfinder-objectname.png {Changing object names}
\li Press \key {Ctrl+A} (or \key {Cmd+A}) to select the widgets and
select \uicontrol{Lay out Horizontally} (or press \key {Ctrl+H} on Linux or
Windows or \key {Ctrl+Shift+H} on \macos) to apply a horizontal
layout (QHBoxLayout).
- \image qtcreator-textfinder-ui-horizontal-layout.png "Applying horizontal layout"
+ \image qtcreator-textfinder-ui-horizontal-layout.png {Applying horizontal layout}
- \li Drag and drop a \uicontrol{Text Edit} widget (QTextEdit) to the form.
+ \li Drag a \uicontrol{Text Edit} widget (QTextEdit) to the form.
\li Select the screen area, and then select \uicontrol{Lay out Vertically}
(or press \key {Ctrl+L}) to apply a vertical layout (QVBoxLayout).
- \image qtcreator-textfinder-ui.png "Text Finder UI"
+ \image qtcreator-textfinder-ui.png {Text Finder UI}
Applying the horizontal and vertical layouts ensures that the
application UI scales to different screen sizes.
@@ -274,11 +272,11 @@
\li Select \uicontrol File > \uicontrol {New File} >
\uicontrol Qt > \uicontrol {Qt Resource File} > \uicontrol Choose.
- \image qtcreator-add-resource-wizard.png "New File dialog"
+ \image qtcreator-add-resource-wizard.png {New File dialog}
The \uicontrol {Choose the Location} dialog opens.
- \image qtcreator-add-resource-wizard2.png "Choose the Location dialog"
+ \image qtcreator-add-resource-wizard2.png {Choose the Location dialog}
\li In the \uicontrol{Name} field, enter \b{textfinder}.
@@ -287,7 +285,7 @@
The \uicontrol{Project Management} dialog opens.
- \image qtcreator-add-resource-wizard3.png "Project Management dialog"
+ \image qtcreator-add-resource-wizard3.png {Project Management dialog}
\li In the \uicontrol{Add to project} field, select \b{TextFinder}
@@ -302,7 +300,7 @@
\li Select \uicontrol Add > \uicontrol {Add Files}, to locate and add
input.txt.
- \image qtcreator-add-resource.png "Editing resource files"
+ \image qtcreator-add-resource.png {Editing resource files}
\endlist
@@ -320,6 +318,6 @@
Now that you have all the necessary files, select the
\inlineimage icons/run_small.png
- button to compile and run your Application.
+ button to compile and run your application.
*/
diff --git a/doc/qtcreatordev/src/creating-plugins.qdoc b/doc/qtcreatordev/src/creating-plugins.qdoc
index 6a83c6d9bf4..2e26dd282c8 100644
--- a/doc/qtcreatordev/src/creating-plugins.qdoc
+++ b/doc/qtcreatordev/src/creating-plugins.qdoc
@@ -31,7 +31,7 @@
\section1 Basics
\list
- \li \l{Getting and Building Qt Creator}
+ \li \l{Getting Qt and Qt Creator}
\li \l{Creating Your First Plugin}
\li \l{Plugin Meta Data}
\li \l{Plugin Life Cycle}
diff --git a/doc/qtcreatordev/src/getting-and-building.qdoc b/doc/qtcreatordev/src/getting-and-building.qdoc
index 24895359571..7079e9f0558 100644
--- a/doc/qtcreatordev/src/getting-and-building.qdoc
+++ b/doc/qtcreatordev/src/getting-and-building.qdoc
@@ -3,53 +3,67 @@
/*!
\page getting-and-building.html
- \title Getting and Building Qt Creator
+ \title Getting Qt and Qt Creator
- \code
- TODO: This should be extended.
- * Windows specific hassle, see README in \QC sources
- \endcode
+ To create and build a \QC plugin, you need a compatible version of Qt,
+ and either a \QC package (released or snapshot) or your own \QC build.
There are several reasons why you might want to do your own build of \QC,
like using the most current development version and being able to tweak \QC
- at one or the other place. It is also necessary if you want to create your
- own \QC plugin.
+ at one or the other place. But it is not strictly necessary for creating
+ plugins. The \QC packages contain a \uicontrol {Plugin Development}
+ component that enables plugin development with the \QC contained in the
+ package.
\section1 Getting Qt
- Prebuilt \QC packages usually use the latest stable release of Qt. You can
- see the exact minimum requirement at the top of \QC's \c {qtcreator.pro}.
- (You can find the current version in our source repository here:
- \l{https://code.qt.io/cgit/qt-creator/qt-creator.git/tree/qtcreator.pro#n4}.)
+ Prebuilt \QC packages usually use the latest stable release of Qt.
+ See the exact Qt version that a \QC package was built with in its
+ \uicontrol {About \QC} dialog.
+
+ The minimum requirement for building \QC is stated in the
+ \l{https://code.qt.io/cgit/qt-creator/qt-creator.git/about/README.md}
+ {README.md} and near the top of the
+ \l{https://code.qt.io/cgit/qt-creator/qt-creator.git/tree/cmake/QtCreatorAPI.cmake}
+ {cmake/QtCreatorAPI.cmake} file in the sources.
You can get prebuilt Qt packages from
\l{https://download.qt.io}{Qt Downloads}. If you want to use Qt as provided
by your Linux distribution, you need to make sure that all Qt development
packages and private header packages are also installed.
- \section1 Getting and Building \QC
+ \section1 Getting \QC
+
+ \section2 Installing a Prebuilt Package
+
+ The prebuilt \QC packages contain a \uicontrol {Plugin Development}
+ component that contains the CMake files, headers and other files
+ that you need to build a plugin. It is not installed by default, so make
+ sure to select the component when installing \QC.
+
+ When developing your plugin, point the \c {CMAKE_PREFIX_PATH} to the
+ installation location of \QC, or the \QC app on macOS.
+
+ Get prebuilt packages either from the
+ \l{https://download.qt.io/official_releases/online_installers/}
+ {Qt online installer}, or a standalone \QC installer either for a
+ \l{https://download.qt.io/official_releases/qtcreator/}
+ {released \QC version} or a \l{https://download.qt.io/snapshots/qtcreator/}
+ {development snapshot}.
+
+ \section2 Building \QC
You can get the \QC sources for a specific version either by using one of
- the released source bundles, or from the Git repository
+ the released source bundles or by cloning the sources from the Git repository
\l{https://code.qt.io/cgit/qt-creator/qt-creator.git}. If you intend to
contribute to \QC itself, you should use the repository from our Gerrit
review tool as described in:
\l{https://wiki.qt.io/Setting_up_Gerrit}{Setting up Gerrit}.
- We strongly encourage you to do out-of-source builds of \QC (also called
- shadow-builds).
+ Refer to the
+ \l{https://code.qt.io/cgit/qt-creator/qt-creator.git/about/README.md}
+ {README.md} included in the sources for details on building \QC.
- After you put the \QC sources somewhere (lets call the path
- \c {})
- you build it on Linux and Mac with
-
- \code
- cd /..
- mkdir qtcreator-build
- cd qtcreator-build
- /bin/qmake -r
- make
- \endcode
-
- or the corresponding commands on Windows systems.
+ When developing your plugin, point the \c {CMAKE_PREFIX_PATH} to the
+ build location of \QC.
*/
diff --git a/doc/qtcreatordev/src/qtcreator-dev.qdoc b/doc/qtcreatordev/src/qtcreator-dev.qdoc
index 5e11b9e7b44..554d5dbb19a 100644
--- a/doc/qtcreatordev/src/qtcreator-dev.qdoc
+++ b/doc/qtcreatordev/src/qtcreator-dev.qdoc
@@ -1,8 +1,8 @@
-// Copyright (C) 2020 The Qt Company Ltd.
+// Copyright (C) 2023 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
/*!
- \page extending-index.html
+ \page index.html
\title Extending Qt Creator Manual
\QC is a cross-platform integrated development environment (IDE) tailored to
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc
index 0448079cbb4..cee8f1fe7ad 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc
@@ -200,11 +200,6 @@
\list
\li \l{Writing Code}
\list
- \li \l{Working in Edit Mode}
- \list
- \li \l{Browsing Project Contents}
- \li \l{Viewing Output}
- \endlist
\li \l{Semantic Highlighting}
\li \l{Checking Code Syntax}
\li \l{Completing Code}
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-loader-3d.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-loader-3d.qdoc
index 6e94c566da8..209b1eba911 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-loader-3d.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-loader-3d.qdoc
@@ -47,9 +47,8 @@
\section2 Source Component
The \uicontrol {Source Component} property defines the component for
- \uicontrol Loader3D to instantiate. Currently, the
- \uicontrol {Source component} needs to be defined in code using the
- \l {Working in Edit Mode}{Edit} mode or the \l {Code} view.
+ \uicontrol Loader3D to instantiate. Currently, you need to define the
+ \uicontrol {Source component} in the \l {Code} view.
\section2 Asynchronous
diff --git a/doc/qtdesignstudio/src/views/qtquick-designer.qdoc b/doc/qtdesignstudio/src/views/qtquick-designer.qdoc
index 1e7d58326ee..60e1dc191f6 100644
--- a/doc/qtdesignstudio/src/views/qtquick-designer.qdoc
+++ b/doc/qtdesignstudio/src/views/qtquick-designer.qdoc
@@ -129,7 +129,7 @@
\li Provides a code editor for viewing and modifying the code
generated by the visual editors.
\li \image ok.png
- \li \l {Working in Edit Mode}
+ \li \l {Writing Code}
\row
\li \l Projects
\li Shows a list of open projects and the files they contain.
@@ -201,12 +201,12 @@
That is, returns the focus to the last location in the last file it
was on.
\li \key Alt+< (\key Opt+Cmd+< on \macos)
- \li \l{Navigating Between Open Files and Symbols}
+ \li
\row
\li \inlineimage icons/next.png
\li \uicontrol {Go Forward}: moves a step forward in your location history.
\li \key Alt+> (\key Opt+Cmd+> on \macos)
- \li \l{Navigating Between Open Files and Symbols}
+ \li
\row
\li \inlineimage icons/close.png
\li \uicontrol {Close Document}: closes the current file.
diff --git a/doc/qtdesignstudio/src/views/qtquick-text-editor.qdoc b/doc/qtdesignstudio/src/views/qtquick-text-editor.qdoc
index 75e84be9c45..3b07e787ecc 100644
--- a/doc/qtdesignstudio/src/views/qtquick-text-editor.qdoc
+++ b/doc/qtdesignstudio/src/views/qtquick-text-editor.qdoc
@@ -21,8 +21,7 @@
\uicontrol Edit > \uicontrol {Find/Replace} > \uicontrol {Find/Replace}.
You can also select \key Ctrl + \key {F}.
- You can use a subset of the functions available in the
- \l{Writing Code}{Edit mode}:
+ The view offers the following features:
\list
\li \l{Semantic Highlighting}
diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs
index 01dd13cc9de..c2557d15af5 100644
--- a/qbs/modules/qtc/qtc.qbs
+++ b/qbs/modules/qtc/qtc.qbs
@@ -6,16 +6,16 @@ import qbs.Utilities
Module {
Depends { name: "cpp"; required: false }
- property string qtcreator_display_version: '11.0.0-rc1'
- property string ide_version_major: '10'
+ property string qtcreator_display_version: '11.0.0'
+ property string ide_version_major: '11'
property string ide_version_minor: '0'
- property string ide_version_release: '84'
+ property string ide_version_release: '0'
property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.'
+ ide_version_release
- property string ide_compat_version_major: '10'
+ property string ide_compat_version_major: '11'
property string ide_compat_version_minor: '0'
- property string ide_compat_version_release: '84'
+ property string ide_compat_version_release: '0'
property string qtcreator_compat_version: ide_compat_version_major + '.'
+ ide_compat_version_minor + '.' + ide_compat_version_release
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/CMakeLists.txt b/share/qtcreator/templates/wizards/projects/qtquickapplication/CMakeLists.txt
index 4166c0217ff..5f9fd95f1b2 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/CMakeLists.txt
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/CMakeLists.txt
@@ -27,8 +27,11 @@ qt_add_qml_module(%{TargetName}
QML_FILES Main.qml
)
+# Qt for iOS sets MACOSX_BUNDLE_GUI_IDENTIFIER automatically since Qt 6.1.
+# If you are developing for iOS or macOS you should consider setting an
+# explicit, fixed bundle identifier manually though.
set_target_properties(%{TargetName} PROPERTIES
- MACOSX_BUNDLE_GUI_IDENTIFIER my.example.com
+# MACOSX_BUNDLE_GUI_IDENTIFIER com.example.%{TargetName}
MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
MACOSX_BUNDLE TRUE
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication_compat/CMakeLists.6.x.txt b/share/qtcreator/templates/wizards/projects/qtquickapplication_compat/CMakeLists.6.x.txt
index d8e87ead7b4..7e35fcdc014 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication_compat/CMakeLists.6.x.txt
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication_compat/CMakeLists.6.x.txt
@@ -17,8 +17,11 @@ qt_add_qml_module(%{TargetName}
QML_FILES main.qml %{AdditionalQmlFiles}
)
+# Qt for iOS sets MACOSX_BUNDLE_GUI_IDENTIFIER automatically since Qt 6.1.
+# If you are developing for iOS or macOS you should consider setting an
+# explicit, fixed bundle identifier manually though.
set_target_properties(%{TargetName} PROPERTIES
- MACOSX_BUNDLE_GUI_IDENTIFIER my.example.com
+# MACOSX_BUNDLE_GUI_IDENTIFIER com.example.%{TargetName}
MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
MACOSX_BUNDLE TRUE
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication_compat/CMakeLists.txt b/share/qtcreator/templates/wizards/projects/qtquickapplication_compat/CMakeLists.txt
index 4d35317a9fe..b7afb831a77 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication_compat/CMakeLists.txt
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication_compat/CMakeLists.txt
@@ -61,8 +61,14 @@ endif()
target_link_libraries(%{ProjectName}
PRIVATE Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Quick)
+# Qt for iOS sets MACOSX_BUNDLE_GUI_IDENTIFIER automatically since Qt 6.1.
+# If you are developing for iOS or macOS you should consider setting an
+# explicit, fixed bundle identifier manually though.
+if(${QT_VERSION} VERSION_LESS 6.1.0)
+ set(BUNDLE_ID_OPTION MACOSX_BUNDLE_GUI_IDENTIFIER com.example.%{ProjectName})
+endif()
set_target_properties(%{ProjectName} PROPERTIES
- MACOSX_BUNDLE_GUI_IDENTIFIER my.example.com
+ ${BUNDLE_ID_OPTION}
MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
MACOSX_BUNDLE TRUE
diff --git a/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/CMakeLists.txt b/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/CMakeLists.txt
index 4bda9db7a79..9d854899c36 100644
--- a/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/CMakeLists.txt
+++ b/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/CMakeLists.txt
@@ -64,8 +64,14 @@ endif()
target_link_libraries(%{ProjectName} PRIVATE Qt${QT_VERSION_MAJOR}::Widgets)
+# Qt for iOS sets MACOSX_BUNDLE_GUI_IDENTIFIER automatically since Qt 6.1.
+# If you are developing for iOS or macOS you should consider setting an
+# explicit, fixed bundle identifier manually though.
+if(${QT_VERSION} VERSION_LESS 6.1.0)
+ set(BUNDLE_ID_OPTION MACOSX_BUNDLE_GUI_IDENTIFIER com.example.%{ProjectName})
+endif()
set_target_properties(%{ProjectName} PROPERTIES
- MACOSX_BUNDLE_GUI_IDENTIFIER my.example.com
+ ${BUNDLE_ID_OPTION}
MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
MACOSX_BUNDLE TRUE
diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts
index 0930f3c8475..ab3fd12f001 100644
--- a/share/qtcreator/translations/qtcreator_de.ts
+++ b/share/qtcreator/translations/qtcreator_de.ts
@@ -9307,7 +9307,7 @@ Locked components cannot be modified or selected.
Force a specific NDK installation to be used by all Android kits.<br/>Note that the forced NDK might not be compatible with all registered Qt versions.
-
+ Erzwingt die Nutzung einer bestimmten NDK-Installation für alle Android-Kits.<br/>Beachten Sie, dass die erzwungene NDK-Installation nicht unbedingt mit allen registrierten Qt-Versionen kompatibel ist.Open Android NDK download URL in the system's browser.
@@ -9319,11 +9319,11 @@ Locked components cannot be modified or selected.
Android SDK path exists and is writable.
-
+ Pfad des Android-SDK existiert und ist schreibbar.JDK path exists and is writable.
-
+ Pfad des JDK existiert und ist schreibbar.Android OpenSSL settings (Optional)
@@ -9383,19 +9383,19 @@ Locked components cannot be modified or selected.
OpenSSL prebuilt libraries cloning failed.
-
+ Das Klonen der vorgefertigten OpenSSL-Bibliotheken ist fehlgeschlagen.The Git tool might not be installed properly on your system.
-
+ Das Git-Werkzeug ist möglicherweise auf Ihrem System nicht richtig installiert.Unset Default
-
+ Vorgabe aufhebenMake Default
- Als Vorgabe setzen
+ Als Vorgabe setzenThe selected path already has a valid SDK Tools package.
@@ -9407,23 +9407,23 @@ Locked components cannot be modified or selected.
Android SDK Command-line Tools installed.
-
+ Kommandozeilen-Werkzeug für Android-SDK ist installiert.Android SDK Command-line Tools run.
-
+ Kommandozeilen-Werkzeug für Android-SDK startet erfolgreich.Android SDK Platform-Tools installed.
-
+ Plattform-Werkzeuge für Android-SDK sind installiert.Android SDK Build-Tools installed.
-
+ Erstellwerkzeuge für Android-SDK sind installiert.Android Platform SDK (version) installed.
-
+ Plattform-SDK (Version) für Android ist installiert.Select an NDK
@@ -9471,7 +9471,7 @@ Locked components cannot be modified or selected.
Failed to create the SDK Tools path %1.
-
+ Das Verzeichnis "%1" für die SDK-Werkzeuge konnte nicht erstellt werden.OpenSSL Cloning
@@ -9503,11 +9503,11 @@ Locked components cannot be modified or selected.
Encountered SSL errors, download is aborted.
-
+ Es sind SSL-Fehler aufgetreten, das Herunterladen wurde abgebrochen.The SDK Tools download URL is empty.
-
+ Die URL zum Herunterladen der SDK-Werkzeuge ist nicht gesetzt.Cancel
@@ -9515,27 +9515,27 @@ Locked components cannot be modified or selected.
Downloading SDK Tools package...
-
+ Paket mit SDK-Werkzeugen wird heruntergeladen...Download SDK Tools
-
+ SDK-Werkzeuge herunterladenCould not open %1 for writing: %2.
-
+ Die Datei "%1" konnte nicht zum Schreiben geöffnet werden: %2.Downloading Android SDK Tools from URL %1 has failed: %2.
-
+ Das Herunterladen der SDK-Werkzeuge für Android von der URL %1 ist fehlgeschlagen: %2.Download from %1 was redirected.
-
+ Das Herunterladen von %1 wurde umgeleitet.Writing and verifying the integrity of the downloaded file has failed.
-
+ Das Schreiben und Prüfen der Integrität der heruntergeladenen Datei sind fehlgeschlagen.Automatically download Android SDK Tools to selected location.
@@ -9583,55 +9583,55 @@ manuellen Herunterladen im Browser des System zu öffnen.
Device name:
- Gerätename:
+ Gerätename:Device type:
- Gerätetyp:
+ Gerätetyp:Unknown
- Unbekannt
+ UnbekanntSerial number:
-
+ Seriennummer:CPU architecture:
-
+ CPU-Architektur:OS version:
- Betriebssystemversion:
+ Betriebssystemversion:Yes
- Ja
+ JaNo
- Nein
+ NeinAuthorized:
-
+ Autorisiert:Android target flavor:
-
+ Android Target-Flavor:Skin type:
-
+ Skin-Typ:OpenGL status:
-
+ OpenGL-Status:Android Device Manager
-
+ Android GerätemanagerRun on Android
@@ -9639,72 +9639,73 @@ manuellen Herunterladen im Browser des System zu öffnen.
Refresh
- Aktualisieren
+ AktualisierenStart AVD
-
+ AVD startenErase AVD
-
+ AVD löschenAVD Arguments
-
+ AVD-ArgumenteSet up Wi-Fi
-
+ Wi-Fi einrichtenEmulator for "%1"
-
+ Emulator für "%1"Physical device
-
+ Physisches GerätNone
- Keine
+ KeinErase the Android AVD "%1"?
This cannot be undone.
-
+ Android-AVD "%1" löschen?
+Dies kann nicht rückgängig gemacht werden.The device has to be connected with ADB debugging enabled to use this feature.
-
+ Das Gerät muss mit aktiviertem ADB-Debuggen angeschlossen sein, um diese Funktionalität nutzen zu können.Opening connection port %1 failed.
-
+ Das Öffnen des Ports %1 für die Verbindung ist fehlgeschlagen.Retrieving the device IP address failed.
-
+ Das Abfragen der IP-Adresse des Geräts ist fehlgeschlagen.The retrieved IP address is invalid.
-
+ Die erhaltene IP-Adresse ist ungültig.Connecting to the device IP "%1" failed.
-
+ Die Verbindung zur Geräte-IP "%1" ist fehlgeschlagen.An error occurred while removing the Android AVD "%1" using avdmanager tool.
-
+ Beim Entfernen des Android-AVD "%1" mit dem avdmanager-Werkzeug ist ein Fehler aufgetreten.Emulator Command-line Startup Options
-
+ Kommandozeilenargumente für den Start des EmulatorsEmulator command-line startup options (<a href="%1">Help Web Page</a>):
-
+ Kommandozeilenargumente für den Start des Emulators (<a href="%1">Hilfeseite</a>):Android Device
@@ -9712,7 +9713,7 @@ This cannot be undone.
The device info returned from AvdDialog is invalid.
-
+ Die vom AvdDialog zurückgelieferte Geräteinformation ist ungültig.NDK is not configured in Devices > Android.
@@ -9781,7 +9782,7 @@ This cannot be undone.
Screen orientation:
-
+ Bildschirmausrichtung:Advanced
@@ -9914,11 +9915,11 @@ This cannot be undone.
Cannot create a new AVD. No suitable Android system image is installed.<br/>Install a system image for the intended Android version from the SDK Manager.
-
+ Erstellen von AVD nicht möglich. Es ist kein geeignetes System-Image installiert.<br/>Installieren Sie ein für die vorgesehene Android-Version passendes System-Image vom SDK-Manager.Cannot create an AVD for ABI %1.<br/>Install a system image for it from the SDK Manager tab first.
-
+ Erstellen von AVD für ABI %1 nicht möglich.<br/>Installieren Sie zuerst ein passendes System-Image vom SDK-Manager.Name:
@@ -9966,15 +9967,15 @@ This cannot be undone.
Java Language Server
-
+ Java Language ServerWould you like to configure Android options? This will ensure Android kits can be usable and all essential packages are installed. To do it later, select Edit > Preferences > Devices > Android.
-
+ Wollen Sie die Android-Einstellungen konfigurieren? Dies stellt sicher, dass Android-Kits nutzbar und alle notwendigen Pakete installiert sind. Wählen Sie Bearbeiten > Einstellungen > Geräte > Android, um dies später durchzuführen.Configure Android
-
+ Android konfigurierenThe process "%1" exited normally.
@@ -10006,64 +10007,65 @@ This cannot be undone.
Uninstall the existing app before deployment
-
+ Existierende Anwendung vor dem Deployment deinstallierenNo Android architecture (ABI) is set by the project.
-
+ Vom Projekt ist keine Android-Architektur (ABI) gesetzt.The kit's run configuration is invalid.
-
+ Die Ausführungskonfiguration des Kits ist ungültig.The kit's build configuration is invalid.
-
+ Die Build-Konfiguration des Kits ist ungültig.The kit's build steps list is invalid.
-
+ Die Liste der Build-Schritte des Kits sind ungültig.The kit's deploy configuration is invalid.
-
+ Die Deployment-Konfiguration des Kits ist ungültig.No valid deployment device is set.
-
+ Es ist kein gültiges Gerät für das Deployment gesetzt.The deployment device "%1" is invalid.
-
+ Das Gerät "%1" für das Deployment ist ungültig.The deployment device "%1" does not support the architectures used by the kit.
The kit supports "%2", but the device uses "%3".
-
+ Das Gerät "%1" für das Deployment unterstützt nicht die Architektur, die vom Kit verwendet wird.
+Das Kit unterstützt "%2", aber das Gerät verwendet "%3".The deployment device "%1" is disconnected.
-
+ Das Gerät "%1" für das Deployment ist nicht verbunden.Android: The main ABI of the deployment device (%1) is not selected. The app execution or debugging might not work properly. Add it from Projects > Build > Build Steps > qmake > ABIs.
-
+ Android: Die Haupt-ABI des Geräts für das Deployment (%1) ist nicht ausgewählt. Das Ausführen oder Debuggen der Anwendung funktioniert möglicherweise nicht korrekt. Fügen Sie sie in Projekte > Erstellen > Schritte zum Erstellen > qmake > ABIs hinzu.The deployment step's project node is invalid.
-
+ Der Projektknoten des Deployment-Schritts ist nicht gültig.Cannot find the androiddeployqt input JSON file.
-
+ Die JSON-Datei für androiddeployqt konnte nicht gefunden werden.Cannot find the package name from the Android Manifest file "%1".
-
+ Der Paketname aus der Android-Manifest-Datei "%1" konnte nicht gefunden werden.Uninstalling the previous package "%1".
-
+ Deinstalliere das vorherige Paket "%1".Starting: "%1"
@@ -10071,11 +10073,11 @@ The kit supports "%2", but the device uses "%3".
Installing the app failed even after uninstalling the previous one.
-
+ Die Installation der Anwendung ist selbst nach der Deinstallation der vorherigen fehlgeschlagen.Installing the app failed with an unknown error.
-
+ Die Installation der Anwendung ist mit einem unbekannten Fehler fehlgeschlagen.Deployment failed with the following errors:
@@ -10095,7 +10097,7 @@ Möchten Sie das vorhandene Paket deinstallieren?
The deployment AVD "%1" cannot be started.
-
+ Das AVD für das Deployment "%1" konnte nicht gestartet werden.Pulling files necessary for debugging.
@@ -10107,7 +10109,7 @@ Möchten Sie das vorhandene Paket deinstallieren?
Deploy to Android device
-
+ Deployment auf Android-Gerät%1 needs additional settings to enable Android support. You can configure those settings in the Options dialog.
@@ -10135,11 +10137,11 @@ Möchten Sie das vorhandene Paket deinstallieren?
"%1" step failed initialization.
-
+ Die Initialisierung des Schritts "%1" ist fehlgeschlagen.Keystore/Certificate password verification failed.
-
+ Die Überprüfung des Keystore/Zertifikat-Passworts ist fehlgeschlagen.Warning: Signing a debug or profile package.
@@ -10147,7 +10149,7 @@ Möchten Sie das vorhandene Paket deinstallieren?
The Qt version for kit %1 is invalid.
-
+ Die Qt-Version für das Kit %1 ist ungültig.The minimum Qt version required for Gradle build to work is %1. It is recommended to install the latest Qt version.
@@ -10173,7 +10175,7 @@ Der vom Kit mindestens benötigte API-Level ist %1.
Product type is not an application, not building an APK.
-
+ Der Produkttyp ist keine Anwendung, erstelle kein APK.Failed to run keytool.
@@ -10215,7 +10217,7 @@ Der vom Kit mindestens benötigte API-Level ist %1.
Could not start process "%1".
-
+ Der Prozess "%1" konnte nicht gestartet werden.Cannot create AVD. Command timed out.
@@ -10227,35 +10229,35 @@ Der vom Kit mindestens benötigte API-Level ist %1.
This is useful for apps that use SSL operations. The path can be defined in Edit > Preferences > Devices > Android.
-
+ Dies ist hilfreich für Anwendungen, die SSL-Operationen durchführen. Der Pfad kann in Bearbeiten > Einstellungen > Geräte > Android angepasst werden.No valid input file for "%1".
-
+ Keine gültige Eingabedatei für "%1".Android build SDK version is not defined. Check Android settings.
-
+ Die Version des Android Build-SDK ist nicht definiert. Überprüfen Sie die Android-Einstellungen.The Android build folder %1 was not found and could not be created.
-
+ Das Build-Verzeichnis "%1" für Android wurde nicht gefunden und konnte nicht erstellt werden.Cannot copy the target's lib file %1 to the Android build folder %2.
-
+ Die lib-Datei "%1" des Targets konnte nicht in das Build-Verzeichnis "%2" für Android kopiert werden.Cannot copy file "%1" to Android build libs folder "%2".
-
+ Die Datei "%1" konnte nicht in das libs-Verzeichnis des Build-Verzeichnisses für Android "%2" kopiert werden.Cannot open androiddeployqt input file "%1" for writing.
-
+ Die Eingabedatei "%1" für androiddeployqt konnte nicht zum Schreiben geöffnet werden.Cannot set up "%1", not building an APK.
-
+ "%1" konnte nicht eingerichtet werden, erstelle kein APK.Enter keystore password
@@ -10275,11 +10277,11 @@ Der vom Kit mindestens benötigte API-Level ist %1.
Cannot find C++ debug server in NDK installation.
-
+ In der NDK-Installation wurde kein C++-Debug-Server gefunden.The lldb-server binary has not been found.
-
+ Die ausführbare Datei für lldb-server wurde nicht gefunden.Failed to forward QML debugging ports.
@@ -10291,7 +10293,7 @@ Der vom Kit mindestens benötigte API-Level ist %1.
Activity Manager threw the error: %1
-
+ Der Activity Manager hat den folgenden Fehler ausgelöst: %1Failed to forward JDB debugging ports.
@@ -10343,27 +10345,27 @@ Der vom Kit mindestens benötigte API-Level ist %1.
Default
- Vorgabe
+ VorgabeStable
-
+ StabilBeta
-
+ BetaDev
-
+ DevCanary
-
+ CanaryInclude obsolete
-
+ Veraltete einschließenInstalled
@@ -10383,13 +10385,15 @@ Der vom Kit mindestens benötigte API-Level ist %1.
Channel:
-
+ Kanal:%1 cannot find the following essential packages: "%2".
Install them manually after the current operation is done.
-
+ %1 kann folgende notwendige Pakete nicht finden: "%2".
+Installieren Sie diese manuell, nachdem der aktuelle Vorgang abgeschlossen ist.
+Checking pending licenses...
@@ -10400,7 +10404,8 @@ Install them manually after the current operation is done.
The installation of Android SDK packages may fail if the respective licenses are not accepted.
-
+ Die Installation von Android-SDK-Paketen kann fehlschlagen, wenn die entsprechenden Lizenzen nicht akzeptiert werden.
+
@@ -10563,15 +10568,15 @@ Breche ausstehende Operationen ab...
<b>Make install:</b> Copy App Files to %1
-
+ <b>Installieren:</b> Anwendungsdateien nach "%1" kopieren"%1" step has an invalid C++ toolchain.
-
+ Schritt "%1" hat eine ungültige C++-Toolchain.Product type is not an application, not running the Make install step.
-
+ Der Produkttyp ist keine Anwendung, führe den Installationsschritt nicht aus.Removing directory %1
@@ -10580,7 +10585,8 @@ Breche ausstehende Operationen ab...
Failed to clean "%1" from the previous build, with error:
%2
-
+ Das Bereinigen von "%1" vom vorherigen Build ist fehlgeschlagen:
+%2Deploy to device
@@ -10604,15 +10610,15 @@ Breche ausstehende Operationen ab...
Activity manager start arguments:
-
+ Activity Manager Startargumente:Pre-launch on-device shell commands:
-
+ Shell-Kommandos auf dem Gerät vor dem Start:Post-quit on-device shell commands:
-
+ Shell-Kommandos auf dem Gerät nach dem Beenden:Create Templates
@@ -10620,7 +10626,7 @@ Breche ausstehende Operationen ab...
Build Android App Bundle (*.aab)
-
+ Android App Bundle (*.aab) erstellenAdditional Libraries
@@ -10652,23 +10658,23 @@ Breche ausstehende Operationen ab...
Android build-tools version:
-
+ Android build-tools-Version:Android build platform SDK:
-
+ Android Build-Plattform-SDK:Create an Android package for Custom Java code, assets, and Gradle configurations.
-
+ Erstellt ein Android-Paket für benutzerdefinierten Java-Code, Assets und Gradle-Konfigurationen.Android customization:
-
+ Android-Anpassungen:Application Signature
-
+ AnwendungssignaturSelect Keystore File
@@ -10748,7 +10754,8 @@ Die Dateien aus dem Quellverzeichnis des Android-Pakets werden in das Verzeichni
The Android template files will be created in the %1 set in the .pro file.
-
+ %1 is the qmake variable ANDROID_PACKAGE_SOURCE_DIR
+ Die Template-Dateien für Android werden in dem Verzeichnis erstellt, dass als %1 in der .pro-Datei angegeben ist.Create Android Template Files Wizard
@@ -10780,290 +10787,295 @@ Die Dateien aus dem Quellverzeichnis des Android-Pakets werden in das Verzeichni
Master icon
-
+ HauptsymbolSelect master icon.
-
+ Hauptsymbol auswählen.LDPI icon
-
+ LDPI-SymbolSelect an icon suitable for low-density (ldpi) screens (~120dpi).
-
+ Wählen Sie ein Symbol, das für Bildschirme mit niedrigem DPI-Wert (ldpi, ~120dpi) geeignet ist.MDPI icon
-
+ MDPI-SymbolSelect an icon for medium-density (mdpi) screens (~160dpi).
-
+ Wählen Sie ein Symbol, das für Bildschirme mit mittlerem DPI-Wert (mdpi, ~160dpi) geeignet ist.HDPI icon
-
+ HDPI-SymbolSelect an icon for high-density (hdpi) screens (~240dpi).
-
+ Wählen Sie ein Symbol, das für Bildschirme mit hohem DPI-Wert (hdpi, ~240dpi) geeignet ist.XHDPI icon
-
+ XHDPI-SymbolSelect an icon for extra-high-density (xhdpi) screens (~320dpi).
-
+ Wählen Sie ein Symbol, das für Bildschirme mit besonders hohem DPI-Wert (xdpi, ~320dpi) geeignet ist.XXHDPI icon
-
+ XXHDPI-SymbolSelect an icon for extra-extra-high-density (xxhdpi) screens (~480dpi).
-
+ Wählen Sie ein Symbol, das für Bildschirme mit ganz besonders hohem DPI-Wert (xxhdpi, ~480dpi) geeignet ist.XXXHDPI icon
-
+ XXXHDPI-SymbolSelect an icon for extra-extra-extra-high-density (xxxhdpi) screens (~640dpi).
-
+ Wählen Sie ein Symbol, das für Bildschirme mit extrem hohem DPI-Wert (xxxdpi, ~640dpi) geeignet ist.Icon scaled up.
-
+ Vergößertes Symbol.Click to select...
-
+ Klicken zum Auswählen...Images (*.png *.jpg *.jpeg *.webp *.svg)
-
+ Bilder (*.png *.jpg *.jpeg *.webp *.svg)%1 has been stopped.
-
+ %1 wurde angehalten.Selected device is invalid.
-
+ Das ausgewählte Gerät ist ungültig.Selected device is disconnected.
-
+ Das ausgewählte Gerät ist nicht verbunden.Launching AVD.
-
+ Starte AVD.Could not start AVD.
-
+ Das Starten des AVD ist fehlgeschlagen.No valid AVD has been selected.
-
+ Es wurde kein gültiges AVD ausgewählt.Checking if %1 app is installed.
-
+ Überprüfe, ob die Anwendung %1 installiert ist.ABI of the selected device is unknown. Cannot install APK.
-
+ Die ABI des ausgewählten Geräts ist unbekannt. Kann das APK nicht installieren.Cannot install %1 app for %2 architecture. The appropriate APK was not found in resources folders.
-
+ Kann die Anwendung %1 nicht für die Architektur %2 installieren. Es wurde kein passendes APK in den Ressourcenverzeichnissen gefunden.Installing %1 APK.
-
+ Installiere APK für %1.Too many .qmlproject files in your project. Open directly the .qmlproject file you want to work with and then run the preview.
-
+ Es existieren zu viele .qmlproject-Dateien in Ihrem Projekt. Öffnen Sie die gewünschte .qmlproject-Datei direkt und starten Sie dann die Vorschau.No .qmlproject file found among project files.
-
+ Es wurde keine .qmlproject-Datei in den Projektdateien gefunden.Could not gather information on project files.
-
+ Das Einholen von Informationen über Projektdateien ist fehlgeschlagen.Could not create file for %1 "%2".
-
+ %2 is a command line for a rcc call
+ Das Erstellen einer Datei für %1 ist fehlgeschlagen ("%2").A timeout occurred running "%1".
-
+ Zeitüberschreitung bei Ausführung von "%1".Crash while creating file for %1 "%2".
-
+ %2 is a command line for a rcc call
+ Der Prozess zum Erstellen einer Datei für %1 ist abgestürzt ("%2").Creating file for %1 failed. "%2" (exit code %3).
-
+ Das Erstellen einer Datei für %1 ist fehlgeschlagen. "%2" (Rückgabewert %3).Uploading files.
-
+ Lade Dateien hoch.Starting %1.
- Starte %1.
+ Starte %1.%1 is running.
-
+ %1 wird ausgeführt.Java:
-
+ Java:Java Language Server:
-
+ Java Language Server:Path to equinox launcher jar
-
+ Pfad zur jar-Datei für den Equinox LauncherSelect splash screen image
-
+ Wählen Sie ein Bild für den StartbildschirmPortrait splash screen
-
+ Startbildschirm (Hochformat)Select portrait splash screen image
-
+ Wählen Sie ein Bild für den Startbildschirm im HochformatLandscape splash screen
-
+ Startbildschirm (Querformat)Select landscape splash screen image
-
+ Wählen Sie ein Bild für den Startbildschirm im QuerformatClear All
-
+ Alle löschenA non-sticky splash screen is hidden automatically when an activity is drawn.
To hide a sticky splash screen, invoke QtAndroid::hideSplashScreen().
-
+ Ein Startbildschirm, der nicht angeheftet (sticky) ist, wird automatisch versteckt, wenn eine Aktivität dargestellt wird.
+Rufen Sie QtAndroid::hideSplashScreen() auf, um einen Startbildschirm zu verstecken, der angeheftet (sticky) ist.Sticky splash screen:
-
+ Angehefteter Startbildschirm (sticky):Image show mode:
-
+ Bildanzeigemodus:Background color of the splash screen.
-
+ Hintergrundfarbe des Startbildschirms.Background color:
-
+ Hintergrundfarbe:Select master image to use.
-
+ Wählen Sie das zu benutzende Hauptbild aus.Master image:
-
+ Hauptbild:Select portrait master image to use.
-
+ Wählen Sie das Hauptbild im Hochformat aus.Portrait master image:
-
+ Hauptbild (Hochformat):Select landscape master image to use.
-
+ Wählen Sie das Hauptbild im Querformat aus.Landscape master image:
-
+ Hauptbild (Querformat):LDPI
-
+ LDPIMDPI
-
+ MDPIHDPI
-
+ HDPIXHDPI
-
+ XHDPIXXHDPI
-
+ XXHDPIXXXHDPI
-
+ XXXHDPIAn image is used for the splashscreen. Qt Creator manages
splashscreen by using a different method which requires changing
the manifest file by overriding your settings. Allow override?
-
+ Für den Startbildschirm wird ein Bild benutzt. Qt Creator verwaltet
+Startbildschirme auf andere Weise, was eine Änderung der Manifest-Datei
+und das Überschreiben Ihrer Einstellungen erfordert. Das Überschreiben erlauben?Convert
-
+ UmwandelnSelect background color
-
+ Hintergrundfarbe auswählenSelect master image
-
+ Hauptbild auswählenSelect portrait master image
-
+ Hauptbild im Hochformat auswählenSelect landscape master image
-
+ Hauptbild im Querformat auswählenImages
-
+ BilderImages (*.png *.jpg *.jpeg)
-
+ Bilder (*.png *.jpg *.jpeg)
@@ -11082,7 +11094,7 @@ the manifest file by overriding your settings. Allow override?Omit run configuration warnings
- Laufzeitkonfigurationsmeldungen auslassen
+ Ausführungskonfigurationsmeldungen auslassenLimit result output
@@ -11090,31 +11102,31 @@ the manifest file by overriding your settings. Allow override?
Limit result description:
-
+ Beschreibung der Resultate begrenzen:Limit number of lines shown in test result tooltip and description.
-
+ Beschränkt die Anzahl der Zeilen, die im Tooltip und der Beschreibung von Testergebnissen angezeigt werden.Open results when tests start
-
+ "Testergebnisse" beim Starten von Tests öffnenDisplays test results automatically when tests are started.
-
+ Öffnet "Testergebnisse" automatisch, wenn Tests gestartet werden.Open results when tests finish
-
+ "Testergebnisse" beim Beenden von Tests öffnenDisplays test results automatically when tests are finished.
-
+ Öffnet "Testergebnisse" automatisch, wenn Tests beendet werden.Displays test results only if the test run contains failed, fatal or unexpectedly passed tests.
-
+ Öffnet "Testergebnisse" nur, wenn der Testlauf durchgefallene, fatale oder unerwartet bestandene Tests enthält.Automatically scroll results
@@ -11126,15 +11138,15 @@ the manifest file by overriding your settings. Allow override?
No active test frameworks or tools.
-
+ Keine aktiven Test-Frameworks oder -Werkzeuge.Mixing test frameworks and test tools.
-
+ Gemischte Test-Frameworks und -Werkzeuge.Mixing test frameworks and test tools can lead to duplicating run information when using "Run All Tests", for example.
-
+ Test-Frameworks und -Werkzeuge im gleichen Projekt zu mischen, kann zum Beispiel zu duplizierter Information beim Nutzen von "Alle Tests ausführen" führen.Timeout:
@@ -11216,15 +11228,15 @@ Warnung: Dies ist eine experimentelle Funktion und könnte dazu führen, dass di
Active frameworks:
-
+ Aktive Frameworks:Automatically run tests after build
-
+ Tests automatisch nach dem Erstellen ausführenNone
- Keine
+ KeineAll
@@ -11436,11 +11448,11 @@ Ausführbare Datei: %2
unexpected passes
- unerwartete Erfolge
+ unerwartet bestandenexpected fails
- erwartete Fehlschläge
+ erwartet durchgefallenfatals
@@ -11448,7 +11460,7 @@ Ausführbare Datei: %2
blacklisted
- indiziert
+ blacklistedskipped
@@ -11472,15 +11484,15 @@ Ausführbare Datei: %2
Run This Test Without Deployment
-
+ Diesen Test ohne Deployment ausführenDebug This Test Without Deployment
-
+ Diesen Test ohne Deployment debuggenRun This Test
- Diesen Test starten
+ Diesen Test ausführenDebug This Test
@@ -11630,67 +11642,67 @@ Dies könnte Probleme während der Ausführung verursachen.
Number of resamples for bootstrapping.
-
+ Anzahl der Resamples für das Bootstrapping. ms
- ms
+ msAbort after
-
+ Abbrechen nachAborts after the specified number of failures.
-
+ Bricht nach der angegebenen Anzahl Fehlschlägen ab.Benchmark samples
-
+ Benchmark-SamplesNumber of samples to collect while running benchmarks.
-
+ Anzahl der beim Ausführen von Benchmarks zu sammelnden Samples.Benchmark resamples
-
+ Benchmark-ResamplesNumber of resamples used for statistical bootstrapping.
-
+ Anzahl der für statistisches Bootstrapping benutzten Resamples.Confidence interval used for statistical bootstrapping.
-
+ Für das statistische Bootstrapping benutzte Konfidenzinterval.Benchmark confidence interval
-
+ Benchmark-KonfidenzintervalBenchmark warmup time
-
+ Benchmark-WarmlaufzeitWarmup time for each test.
-
+ Die Warmlaufzeit für jeden Test.Disable analysis
-
+ Analyse deaktivierenDisables statistical analysis and bootstrapping.
-
+ Deaktiviert die statistische Analyse und das Bootstrapping.Show success
-
+ Erfolge anzeigenShow success for tests.
-
+ Testerfolge anzeigen.Turns failures into debugger breakpoints.
@@ -11698,27 +11710,27 @@ Dies könnte Probleme während der Ausführung verursachen.
Skip throwing assertions
-
+ Assertions auf geworfene Ausnahmen überspringenSkips all assertions that test for thrown exceptions.
-
+ Überspringt alle Assertions, die auf geworfene Ausnahmen testen.Visualize whitespace
-
+ Leerzeichen darstellenMakes whitespace visible.
-
+ Macht Leerzeichen sichtbar.Warn on empty tests
-
+ Bei leeren Tests warnenWarns if a test section does not check any assertion.
-
+ Warnt, wenn ein Testabschnitt keine Assertions prüft.Break on failure while debugging
@@ -11758,79 +11770,79 @@ Dies könnte Probleme während der Ausführung verursachen.
Output on failure
-
+ Ausgabe bei FehlschlagOutput mode
-
+ AusgabemodusDefault
- Vorgabe
+ VorgabeVerbose
- Ausführlich
+ AusführlichVery Verbose
-
+ Sehr ausführlichRepetition mode
-
+ WiederholungsmodusUntil Fail
-
+ Bis zu FehlschlagUntil Pass
-
+ Bis zu ErfolgAfter Timeout
-
+ Nach ZeitüberschreitungCount
- Anzahl
+ AnzahlNumber of re-runs for the test.
-
+ Anzahl der Wiederholungen des Tests.Schedule random
-
+ Zufällig planenStop on failure
-
+ Bei Fehlschlag anhaltenRun tests in parallel mode using given number of jobs.
-
+ Tests in der angegebenen Anzahl parallel ausführen.Jobs
-
+ JobsTest load
-
+ TestauslastungTry not to start tests when they may cause CPU load to pass a threshold.
-
+ Versucht, keine neuen Tests zu starten, wenn dies die CPU-Last über einen Schwellenwert erhöhen könnte.Threshold
- Grenze
+ SchwellenwertCTest
-
+ CTestRepeat tests
@@ -11838,15 +11850,15 @@ Dies könnte Probleme während der Ausführung verursachen.
Run in parallel
-
+ Parallel ausführenLog format:
-
+ Protokollformat:Report level:
-
+ Report-Stufe:Seed:
@@ -11854,39 +11866,39 @@ Dies könnte Probleme während der Ausführung verursachen.
A seed of 0 means no randomization. A value of 1 uses the current time, any other value is used as random seed generator.
-
+ Ein Startwert von 0 bedeutet keine Randomisierung. Ein Wert von 1 benutzt die aktuelle Zeit, jeder andere Wert wird als Startwert für Zufallszahlen benutzt.Randomize
-
+ RandomisierenRandomize execution order.
-
+ Ausführungsreihenfolge randomisieren.Catch system errors
-
+ Systemfehler auffangenCatch or ignore system errors.
-
+ Systemfehler auffangen oder ignorieren.Floating point exceptions
-
+ Gleitkomma-AusnahmenEnable floating point exception traps.
-
+ Aktiviert das Auffangen von Ausnahmen für Gleitkommazahlen.Detect memory leaks
-
+ Speicherlecks feststellenEnable memory leak detection.
-
+ Aktiviert das Feststellen von Speicherlecks.A seed of 0 generates a seed based on the current timestamp.
@@ -11944,24 +11956,25 @@ Weitere Informationen über GTest-Filter finden Sie in der Dokumenation von Goog
Limit warnings
-
+ Warnungen einschränkenSet the maximum number of warnings. 0 means that the number is not limited.
-
+ Legt die Höchstzahl an Warnungen fest. 0 bedeutet, dass die Anzahl nicht begrenzt ist.Unlimited
-
+ UnbegrenztCheck for derived Qt Quick tests
-
+ Auf abgeleitete Qt Quick-Tests überprüfenSearch for Qt Quick tests that are derived from TestCase.
Warning: Enabling this feature significantly increases scan time.
-
+ Sucht nach Qt Quick-Tests, die von TestCase abgeleitet sind.
+Achtung: Dies erhöht die zum Durchsuchen benötigte Zeit erheblich.Benchmark Metrics
@@ -12053,11 +12066,11 @@ Warnung: Reinem Text fehlen manche Informationen, etwa die Dauer.
Run &All Tests
- Starte &alle Tests
+ &Alle Tests ausführenRun All Tests
-
+ Alle Tests ausführenCtrl+Meta+T, Ctrl+Meta+A
@@ -12069,23 +12082,23 @@ Warnung: Reinem Text fehlen manche Informationen, etwa die Dauer.
Run All Tests Without Deployment
-
+ Alle Tests ohne Deployment ausführenCtrl+Meta+T, Ctrl+Meta+E
-
+ Ctrl+Meta+T, Ctrl+Meta+EAlt+Shift+T,Alt+E
-
+ Alt+Shift+T,Alt+E&Run Selected Tests
- Sta&rte ausgewählte Tests
+ Ausgewählte Tests ausfüh&renRun Selected Tests
-
+ Ausgewählte Tests ausführenCtrl+Meta+T, Ctrl+Meta+R
@@ -12097,11 +12110,11 @@ Warnung: Reinem Text fehlen manche Informationen, etwa die Dauer.
Run Selected Tests Without Deployment
-
+ Ausgewählte Tests ohne Deployment ausführenRun Failed Tests
-
+ Fehlgeschlagene Tests ausführenCtrl+Meta+T, Ctrl+Meta+F
@@ -12109,23 +12122,23 @@ Warnung: Reinem Text fehlen manche Informationen, etwa die Dauer.
Run Tests for Current File
-
+ Tests für die aktuelle Datei ausführen&Run Selected Tests Without Deployment
-
+ Ausgewählte Tests ohne Deployment ausfüh&renCtrl+Meta+T, Ctrl+Meta+W
-
+ Ctrl+Meta+T, Ctrl+Meta+WAlt+Shift+T,Alt+W
-
+ Alt+Shift+T,Alt+WRun &Failed Tests
-
+ &Fehlgeschlagene Tests ausführenAlt+Shift+T,Alt+F
@@ -12133,15 +12146,15 @@ Warnung: Reinem Text fehlen manche Informationen, etwa die Dauer.
Run Tests for &Current File
-
+ Tests für die aktuelle &Datei ausführenCtrl+Meta+T, Ctrl+Meta+C
-
+ Ctrl+Meta+T, Ctrl+Meta+CAlt+Shift+T,Alt+C
-
+ Alt+Shift+T,Alt+CRe&scan Tests
@@ -12157,15 +12170,15 @@ Warnung: Reinem Text fehlen manche Informationen, etwa die Dauer.
Run Test Under Cursor Without Deployment
-
+ Tests unter Einfügemarke ohne Deployment ausführenDebug Test Under Cursor Without Deployment
-
+ Tests unter Einfügemarke ohne Deployment debuggenCannot debug multiple tests at once.
-
+ Debuggen von mehreren Tests gleichzeitig ist nicht möglich.Selected test was not found (%1).
@@ -12181,49 +12194,51 @@ Warnung: Reinem Text fehlen manche Informationen, etwa die Dauer.
Executing test module %1
-
+ Führe Test-Modul %1 ausTest execution took %1.
- Testausführung benötigte %1.
+ Testausführung benötigte %1.Test suite execution took %1.
-
+ Test-Suite-Ausführung benötigte %1.Test module execution took %1.
-
+ Test-Modul-Ausführung benötigte %1.%1 failures detected in %2.
-
+ %1 Fehlschläge in %2 gefunden.%1 tests passed.
-
+ %1 Tests bestanden.No errors detected.
-
+ Keine Fehler festgestellt.Running tests exited with %1.
-
+ Ausführung von Tests wurde mit Rückgabewert %1 beendet.Executable: %1
-
+ Ausführbare Datei: %1Running tests failed.
%1
Executable: %2
-
+ Ausführung von Tests fehlgeschlagen.
+%1
+Ausführbare Datei: %2Running tests without output.
-
+ Ausführung von Tests ohne Ausgabe.parameterized
@@ -12243,143 +12258,143 @@ Executable: %2
Catch Test
-
+ Catch TestException:
-
+ Ausnahme:Executing %1 "%2"...
-
+ Führe %1 "%2" aus...%1 "%2" passed.
-
+ %1 "%2" bestanden.Expression passed.
-
+ Ausdruck bestanden.Finished executing %1 "%2".
-
+ Ausführung von %1 "%2" beendet.Expression failed: %1
-
+ Ausdruck fehlgeschlagen: %1Google Test
- Google Test
+ Google TestEnable or disable grouping of test cases by folder or GTest filter.
See also Google Test settings.
- Gruppierung von Testfällen nach Verzeichnis oder GTest-Filter ein- oder ausschalten.
+ Gruppierung von Testfällen nach Verzeichnis oder GTest-Filter ein- oder ausschalten.
Siehe auch die Einstellungen für Google Test.<matching>
- <passend>
+ <passend><not matching>
- <nicht passend>
+ <nicht passend>Change GTest filter in use inside the settings.
- Ändern Sie den verwendeten GTest-Filter in den Einstellungen.
+ Ändern Sie den verwendeten GTest-Filter in den Einstellungen.typed
- typisiert
+ typisiertQt Test
- Qt Test
+ Qt Test<p>Multiple testcases inside a single executable are not officially supported. Depending on the implementation they might get executed or not, but never will be explicitly selectable.</p>
-
+ <p>Mehrere Testfälle in der gleichen ausführbaren Datei werden nicht offiziell unterstützt. Abhängig von der Implementation werden sie möglicherweise ausgeführt oder auch nicht, aber sie werden niemals explizit auswählbar sein.</p>inherited
- vererbt
+ vererbtmultiple testcases
-
+ mehrere TestfälleQuick Test
- Quick Test
+ Quick Test<unnamed>
- <unbenannt>
+ <unbenannt>Give all test cases a name to ensure correct behavior when running test cases and to be able to select them
-
+ Geben Sie allen Testfällen einen Namen, um korrektes Verhalten sicherzustellen und sie auswählen zu können%1 (none)
- %1 (keine)
+ %1 (keine)Auto Test
-
+ Auto TestRunning tests for "%1".
-
+ Führe Tests für "%1" aus.QtC::AutotoolsProjectManagerArguments:
- Argumente:
+ Argumente:Configuration unchanged, skipping autogen step.
- Unveränderte Konfiguration, autogen-Schritt wird übersprungen.
+ Unveränderte Konfiguration, autogen-Schritt wird übersprungen.AutogenDisplay name for AutotoolsProjectManager::AutogenStep id.
- Autogen
+ AutogenConfiguration unchanged, skipping autoreconf step.
- Unveränderte Konfiguration, autoreconf-Schritt wird übersprungen.
+ Unveränderte Konfiguration, autoreconf-Schritt wird übersprungen.AutoreconfDisplay name for AutotoolsProjectManager::AutoreconfStep id.
- Autoreconf
+ AutoreconfAutotools Manager
- Autotools-Verwaltung
+ Autotools-VerwaltungConfiguration unchanged, skipping configure step.
- Unveränderte Konfiguration, configure-Schritt wird übersprungen.
+ Unveränderte Konfiguration, configure-Schritt wird übersprungen.ConfigureDisplay name for AutotoolsProjectManager::ConfigureStep id.
- Konfigurieren
+ ConfigureParsing %1 in directory %2
- Werte %1 im Verzeichnis %2 aus
+ Werte %1 im Verzeichnis %2 ausParsing directory %1
- Werte Verzeichnis %1 aus
+ Werte Verzeichnis %1 aus
@@ -13916,7 +13931,7 @@ Zum Beispiel bewirkt die Angabe "Revision: 15" dass der Branch auf Rev
Locates bookmarks. Filter by file name, by the text on the line of the bookmark, or by the bookmark's note text.
-
+ Findet Lesezeichen. Filtert nach dem Dateinamen, dem Text in der Zeile des Lesezeichens oder seinem Anmerkungstext.Bookmark
@@ -14255,7 +14270,7 @@ Zum Beispiel bewirkt die Angabe "Revision: 15" dass der Branch auf Rev
Reload CMake Presets
-
+ CMake Presets neu ladenBuild
@@ -14275,11 +14290,11 @@ Zum Beispiel bewirkt die Angabe "Revision: 15" dass der Branch auf Rev
Re-generates the kits that were created for CMake presets. All manual modifications to the CMake project settings will be lost.
-
+ Erstellt die Kits neu, die für CMake Presets erstellt wurden. Alle manuellen Änderungen an den CMake-Projekteinstellungen gehen dabei verloren.Reload
- Neu laden
+ Neu ladenBuild File is not supported for generator "%1"
@@ -14439,11 +14454,11 @@ Zum Beispiel bewirkt die Angabe "Revision: 15" dass der Branch auf Rev
Stage for installation
-
+ Für die Installation bereitstellenStaging directory:
-
+ Bereitstellungsverzeichnis:Enable automatic provisioning updates:
@@ -14484,7 +14499,7 @@ Zum Beispiel bewirkt die Angabe "Revision: 15" dass der Branch auf Rev
Stage at %2 for %3Stage (for installation) at <staging_dir> for <installation_dir>
-
+ In %2 für %3 bereitstellenCMake Build
@@ -14587,7 +14602,7 @@ Zum Beispiel bewirkt die Angabe "Revision: 15" dass der Branch auf Rev
Ask before reloading CMake Presets
-
+ Vor dem Neuladen von CMake Presets nachfragenShow subfolders inside source group folders
@@ -14659,7 +14674,7 @@ Zum Beispiel bewirkt die Angabe "Revision: 15" dass der Branch auf Rev
Running in %1: %2.
-
+ Führe in %1 aus: %2.<No CMake Tool available>
@@ -14823,7 +14838,7 @@ Zum Beispiel bewirkt die Angabe "Revision: 15" dass der Branch auf Rev
Build CMake Target
-
+ CMake-Ziel erstellenBuilds a target of any open CMake project.
@@ -14831,11 +14846,11 @@ Zum Beispiel bewirkt die Angabe "Revision: 15" dass der Branch auf Rev
Open CMake Target
-
+ CMake-Ziel öffnenLocates the definition of a target of any open CMake project.
-
+ Findet die Definition eines Ziels in allen geöffneten CMake-Projekten.The source directory %1 is not reachable by the CMake executable %2.
@@ -14887,7 +14902,7 @@ Zum Beispiel bewirkt die Angabe "Revision: 15" dass der Branch auf Rev
<Generated Files>
-
+ <Generierte Dateien>Unexpected source directory "%1", expected "%2". This can be correct in some situations, for example when importing a standalone Qt test, but usually this is an error. Import the build anyway?
@@ -14899,7 +14914,7 @@ Zum Beispiel bewirkt die Angabe "Revision: 15" dass der Branch auf Rev
CMake Presets
-
+ CMake PresetsTarget type:
@@ -15587,7 +15602,7 @@ Stellen Sie sicher, dass der Wert der CMAKE_BUILD_TYPE-Variable derselbe wie der
Override .clang-format file
-
+ .clang-format-Datei außer Kraft setzenUse global settings
@@ -15615,7 +15630,7 @@ Stellen Sie sicher, dass der Wert der CMAKE_BUILD_TYPE-Variable derselbe wie der
When this option is enabled, ClangFormat will use a user-specified configuration from the widget below, instead of the project .clang-format file. You can customize the formatting options for your code by adjusting the settings in the widget. Note that any changes made there will only affect the current configuration, and will not modify the project .clang-format file.
-
+ Wenn diese Einstellung aktiviert ist, wird statt der .clang-format-Datei des Projekts die benutzerdefinierte Einstellung unten benutzt. Beachten Sie, dass die unten durchgeführten Einstellungen nur die aktuelle Konfiguration beeinflussen und die .clang-format-Datei des Projekts nicht verändert wird.ClangFormat
@@ -15798,7 +15813,7 @@ Setzen Sie erst eine gültige ausführbare Datei.
Prefer .clang-tidy file, if present
-
+ .clang-tidy-Datei bevorzugen, sofern vorhandenBuild the project before analysis
@@ -15916,7 +15931,7 @@ Setzen Sie erst eine gültige ausführbare Datei.
Set a valid %1 executable.
-
+ Wählen Sie eine gültige ausführbare Datei für %1.Project "%1" is not a C/C++ project.
@@ -16589,19 +16604,19 @@ Setzen Sie erst eine gültige ausführbare Datei.
Close Check In Editor
-
+ Check-In-Editor schließenClosing this editor will abort the check in.
-
+ Wenn Sie diesen Editor schließen, wird der Check-In abgebrochen.Cannot check in.
-
+ Check-In fehlgeschlagen.Cannot check in: %1.
-
+ Check-In fehlgeschlagen: %1.Do you want to undo the check out of "%1"?
@@ -16704,23 +16719,23 @@ Setzen Sie erst eine gültige ausführbare Datei.
QtC::CocoSelect a Squish Coco CoverageBrowser Executable
-
+ Wählen Sie eine ausführbare Datei für den Squish-Coco-CoverageBrowserCoverageBrowser:
-
+ CoverageBrowser:Coco instrumentation files (*.csmes)
-
+ Coco-Instrumentierungsdateien (*.csmes)Select a Squish Coco Instrumentation File
-
+ Wählen Sie eine Squish-Coco-InstrumentierungsdateiCSMes:
-
+ CSMes:
@@ -16918,173 +16933,176 @@ Setzen Sie erst eine gültige ausführbare Datei.
Change Root Directory
-
+ Wurzelverzeichnis ändernQtC::ConanConan install
-
+ Mit Conan installierenConan file:
-
+ Conan-Datei:Enter location of conanfile.txt or conanfile.py.
-
+ Geben Sie den Ort der Datei conanfile.txt oder conanfile.py an.Additional arguments:
- Zusätzliche Argumente:
+ Zusätzliche Argumente:Run conan install
-
+ Conan install ausführenQtC::CopilotSign In
-
+ AnmeldenA browser window will open. Enter the code %1 when asked.
The code has been copied to your clipboard.
-
+ Es wird sich ein Browser-Fenster öffnen. Geben Sie auf Anfrage den Code %1 ein.
+Der Code wurde in die Zwischenablage kopiert.Login Failed
-
+ Anmeldung fehlgeschlagenThe login request failed:
-
+ Die Anmeldung ist fehlgeschlagen: Select Previous Copilot Suggestion
-
+ Vorangehenden Copilot-Vorschlag auswählenSelect Next Copilot Suggestion
-
+ Nächsten Copilot-Vorschlag auswählenApply (%1)
-
+ Anwenden (%1)Apply Word (%1)
-
+ Wort anwenden (%1)%1 of %2
- %1 von %2
+ %1 von %2Enabling %1 is subject to your agreement and abidance with your applicable %1 terms. It is your responsibility to know and accept the requirements and parameters of using tools like %1. This may include, but is not limited to, ensuring you have the rights to allow %1 access to your code, as well as understanding any implications of your use of %1 and suggestions produced (like copyright, accuracy, etc.).
-
+ Das Aktivieren von %1 unterliegt Ihrer Zustimmung und der Einhaltung der für Sie geltenden Bestimmungen für die Nutzung von %1. Es liegt in Ihrer Verantwortung, die Bedingungen und Parameter für die Nutzung von Werkzeugen wie %1 zu kennen und zu akzeptieren. Dies umfasst unter anderem, aber beschränkt sich nicht darauf, sicherzustellen, dass Sie das Recht haben, %1 Zugriff zu Ihrem Code zu geben, und dass Sie die Implikationen Ihrer Nutzung von %1 und der davon erstellten Vorschläge kennen (bzgl. Urheberrecht, Copyright, Genauigkeit, usw.).The Copilot plugin requires node.js and the Copilot neovim plugin. If you install the neovim plugin as described in %1, the plugin will find the agent.js file automatically.
Otherwise you need to specify the path to the %2 file from the Copilot neovim plugin.Markdown text for the copilot instruction label
-
+ Das Copilot-Plugin benötigt node.js und das Copilot-Plugin für Neovim. Wenn Sie das Neovim-Plugin wie in der %1 beschrieben installieren, findet das Plugin die Datei agent.js automatisch.
+
+Ansonsten müssen Sie den Pfad zur Datei %2 aus dem Copilot-Plugin für Neovim angeben.Note:
- Hinweis:
+ Hinweis:Request Copilot Suggestion
-
+ Vorschlag von Copilot anfordernRequest Copilot suggestion at the current editor's cursor position.
-
+ Fordert Vorschläge für die Cursorposition des aktuellen Editors von Copilot an.Show next Copilot Suggestion
-
+ Nächsten Copilot-Vorschlag zeigenCycles through the received Copilot Suggestions showing the next available Suggestion.
-
+ Iteriert über die Vorschläge von Copilot und zeigt den nächsten verfügbaren Vorschlag.Show previos Copilot Suggestion
-
+ Vorangehenden Copilot-Vorschlag zeigenCycles through the received Copilot Suggestions showing the previous available Suggestion.
-
+ Iteriert über die Vorschläge von Copilot und zeigt den vorangehenden verfügbaren Vorschlag.Disable Copilot
-
+ Copilot deaktivierenDisable Copilot.
-
+ Deaktiviere Copilot.Enable Copilot
-
+ Copilot aktivierenEnable Copilot.
-
+ Aktiviere Copilot.Toggle Copilot
-
+ Copilot umschaltenCopilot
-
+ CopilotEnables the Copilot integration.
-
+ Aktiviert die Copilot-Integration.Node.js path:
-
+ Pfad zu Node.js:Node.js Path
-
+ Pfad zu Node.jsSelect path to node.js executable. See https://nodejs.org/en/download/for installation instructions.
-
+ Wählen Sie den Pfad zur ausführbaren node.js-Datei. Siehe auch https://nodejs.org/en/download/ für eine Installationsanleitung.Path to agent.js:
-
+ Pfad zu agent.js:Agent.js path
-
+ Pfad zu agent.jsSelect path to agent.js in Copilot Neovim plugin. See https://github.com/github/copilot.vim#getting-started for installation instructions.
-
+ Wählen Sie den Pfad zur agent.js-Datei vom Copilot-Plugin für Neovim. Siehe auch https://github.com/github/copilot.vim#getting-started für eine Installationsanleitung.Auto Complete
- Automatische Vervollständigung
+ Automatische VervollständigungRequest completions automatically
-
+ Vervollständigung automatisch anfordernAutomatically request suggestions for the current text cursor position after changes to the document.
-
+ Fordert Vorschläge für die aktuelle Cursorposition nach Änderungen am Dokument automatisch an.
@@ -17239,7 +17257,7 @@ Trotzdem fortfahren?
Toolbar style:
-
+ Werkzeugleisten-Stil:Text codec for tools:
@@ -17251,11 +17269,11 @@ Trotzdem fortfahren?
Compact
-
+ KompaktRelaxed
-
+ EntspanntInterface
@@ -18565,7 +18583,7 @@ konnte nicht unter Versionsverwaltung (%2) gestellt werden
Locates files from a custom set of directories. Append "+<number>" or ":<number>" to jump to the given line number. Append another "+<number>" or ":<number>" to jump to the column number as well.
-
+ Findet Dateien aus vom Benutzer gewählten Pfaden. Fügen Sie "+<Zahl>" oder ":<Zahl>" an, um zur angegebenen Zeile zu springen. Fügen Sie noch einmal "+<Zahl>" oder ":<Zahl>" an, um auch zur angegebenen Spalte zu springen.Add...
@@ -18700,15 +18718,15 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeiche
Create Directory
-
+ Verzeichnis erzeugenCreate and Open File "%1"
-
+ Erzeuge und öffne Datei "%1"Create Directory "%1"
-
+ Erzeuge Verzeichnis "%1"Include hidden files
@@ -19040,11 +19058,11 @@ Möchten Sie es beenden?
Triggers a web search with the selected search engine.
-
+ Führt eine Suche im Internet mit der ausgewählten Suchmaschine aus.Triggers a search in the Qt bug tracker.
-
+ Führt eine Suche im Qt-Bugtracker aus.<html><body style="color:#909090; font-size:14px"><div align='center'><div style="font-size:20px">Open a document</div><table><tr><td><hr/><div style="margin-top: 5px">• File > Open File or Project (%1)</div><div style="margin-top: 5px">• File > Recent Files</div><div style="margin-top: 5px">• Tools > Locate (%2) and</div><div style="margin-left: 1em">- type to open file from any open project</div>%4%5<div style="margin-left: 1em">- type <code>%3<space><filename></code> to open file from file system</div><div style="margin-left: 1em">- select one of the other filters for jumping to a location</div><div style="margin-top: 5px">• Drag and drop files here</div></td></tr></table></div></body></html>
@@ -19642,7 +19660,7 @@ Möchten Sie sie jetzt auschecken?
MiB
-
+ MiBEnable crash reporting
@@ -19879,7 +19897,7 @@ provided they were unmodified before the refactoring.
Locates files from a global file system index (Spotlight, Locate, Everything). Append "+<number>" or ":<number>" to jump to the given line number. Append another "+<number>" or ":<number>" to jump to the column number as well.
-
+ Findet Dateien aus einem globalen Dateisystemindex (Spotlight, Locate, Everything). Fügen Sie "+<Zahl>" oder ":<Zahl>" an, um zur angegebenen Zeile zu springen. Fügen Sie noch einmal "+<Zahl>" oder ":<Zahl>" an, um auch zur angegebenen Spalte zu springen.Case sensitive:
@@ -19919,15 +19937,15 @@ provided they were unmodified before the refactoring.
The evaluation was interrupted.
-
+ Die Auswertung wurde unterbrochen.Engine reinitialized properly.
-
+ Die Engine hat sich korrekt neu initialisiert.Engine did not reinitialize properly.
-
+ Die Engine hat sich nicht korrekt neu initialisiert.Copy to clipboard: %1
@@ -20008,11 +20026,11 @@ Doppelklicken Sie einen Eintrag um ihn zu ändern.
Show All
-
+ Alle anzeigenBack
- Zurück
+ ZurückText Encoding
@@ -20468,11 +20486,11 @@ Doppelklicken Sie einen Eintrag um ihn zu ändern.
Switches to an open document.
-
+ Wechselt zu einem offenen Dokument.Markdown Editor
-
+ Markdown-Editor
@@ -20687,7 +20705,7 @@ Doppelklicken Sie einen Eintrag um ihn zu ändern.
Add Member Function "%1"
-
+ Memberfunktion "%1" hinzufügenExtract Constant as Function Parameter
@@ -21701,7 +21719,7 @@ z.B. name = "m_test_foo_":
Locates C++ symbols in the current document.
-
+ Findet C++-Symbole im aktuellen Dokument.C++ Classes
@@ -21709,7 +21727,7 @@ z.B. name = "m_test_foo_":
Locates C++ classes in any open project.
-
+ Findet C++-Klassen in allen offenen Projekten.C++ Functions
@@ -21717,7 +21735,7 @@ z.B. name = "m_test_foo_":
Locates C++ functions in any open project.
-
+ Findet C++-Funktionen in allen offenen Projekten.All Included C/C++ Files
@@ -21730,7 +21748,7 @@ z.B. name = "m_test_foo_":
Locates C++ classes, enums, functions and type aliases in any open project.
-
+ Findet C++-Klassen, -Aufzählungen, -Funktionen und -Typaliase in allen offenen Projekten.C++ Symbols
@@ -21798,15 +21816,15 @@ z.B. name = "m_test_foo_":
Use Built-in Only
-
+ Nur integriertes Backend benutzenUse Clangd Only
-
+ Nur Clangd benutzenTry Both
-
+ Beide versuchenInterpret ambiguous headers as C headers
@@ -21854,7 +21872,7 @@ z.B. name = "m_test_foo_":
<p>Which C/C++ backend to use when switching between header and source file.<p>The clangd implementation has more capabilities, but also has some bugs not present in the built-in variant.<p>When "Try Both" is selected, clangd will be employed only if the built-in variant does not find anything.
-
+ <p>Bestimmt, welches C/C++-Backend zum Wechseln zwischen Header- und Quelldatei benutzt wird.<p>Die Clangd-Implementation hat mehr Fähigkeiten, aber auch einige Fehler, die nicht in der integrierten Variante vorhanden sind.<p>Wenn "Beide versuchen" ausgewählt ist, wird Clangd nur benutzt, wenn die integrierte Variant nichts findet.Number of worker threads used by clangd. Background indexing also uses this many worker threads.
@@ -21910,7 +21928,7 @@ Das integrierte Codemodell übernimmt Syntaxhervorhebung, Code-Vervollständigun
Header/source switch mode:
-
+ Modus für das Wechseln zwischen Header- und Quelldatei:Worker thread count:
@@ -22262,7 +22280,7 @@ Flags: %3
Locates files that are included by C++ files of any open project. Append "+<number>" or ":<number>" to jump to the given line number. Append another "+<number>" or ":<number>" to jump to the column number as well.
-
+ Findet alle Dateien die von allen C++-Dateien aller Projekte eingebunden werden. Fügen Sie "+<Zahl>" oder ":<Zahl>" an, um zur angegebenen Zeile zu springen. Fügen Sie noch einmal "+<Zahl>" oder ":<Zahl>" an, um auch zur angegebenen Spalte zu springen.
@@ -22408,23 +22426,23 @@ Flags: %3
Percentage
-
+ ProzentMinimum Time
-
+ Minimale ZeitAverage Time
-
+ Durchschnittliche ZeitMaximum Time
-
+ Maximale ZeitStack Level %1
-
+ Stack-Level %1Value
@@ -22432,35 +22450,35 @@ Flags: %3
Min
-
+ MinMax
-
+ MaxStart
-
+ AnfangWall Duration
-
+ Tatsächliche DauerUnfinished
-
+ Unvollendettrue
-
+ wahrThread %1
-
+ Thread %1Categories
-
+ KategorienArguments
@@ -22468,43 +22486,43 @@ Flags: %3
Instant
-
+ InstantScope
-
+ Gültigkeitsbereichglobal
-
+ globalprocess
-
+ Prozessthread
-
+ ThreadReturn Arguments
-
+ RückgabeargumentChrome Trace Format Viewer
-
+ Chrome Trace-Format-BetrachterLoad JSON File
-
+ JSON-Datei ladenRestrict to Threads
-
+ Auf Threads beschränkenTimeline
-
+ ZeitleisteReset Zoom
@@ -22516,36 +22534,37 @@ Flags: %3
Load Chrome Trace Format File
-
+ Chrome Trace-Format-Datei ladenJSON File (*.json)
-
+ JSON-Datei (*.json)The file does not contain any trace data.
-
+ Die Datei enthält keine Trace-Daten.Loading CTF File
-
+ Lade CTF-DateiCTF Visualizer
-
+ CTF-BetrachterCannot read the CTF file.
-
+ Die CTF-Datei kann nicht gelesen werden.The trace contains threads with stack depth > 512.
Do you want to display them anyway?
-
+ Die Trace-Daten enthalten Threads mit einer Stack-Tiefe größer als 512.
+Möchten Sie die Daten trotzdem anzeigen?Chrome Trace Format Visualizer
-
+ Chrome Trace-Format-Visualisierer
@@ -24570,23 +24589,23 @@ markers in the source code editor.
The DAP process failed to start. Either the invoked program "%1" is missing, or you may have insufficient permissions to invoke the program.
-
+ Der Start des DAP-Prozesses schlug fehl. Entweder fehlt die ausführbare Datei "%1" oder die Berechtigungen sind nicht ausreichend.The DAP process crashed some time after starting successfully.
-
+ Der DAP-Prozess ist einige Zeit nach dem Start abgestürzt.An error occurred when attempting to write to the DAP process. For example, the process may not be running, or it may have closed its input channel.
-
+ Ein Fehler trat beim Versuch auf, zum DAP-Prozess zu schreiben. Wahrscheinlich läuft der Prozess nicht oder hat seinen Eingabekanal geschlossen.An error occurred when attempting to read from the DAP process. For example, the process may not be running.
-
+ Ein Fehler trat beim Versuch auf, vom DAP-Prozess zu lesen. Wahrscheinlich läuft der Prozess nicht.An unknown error in the DAP process occurred.
-
+ Im DAP-Prozess trat ein unbekannter Fehler auf.Adapter start failed
@@ -24594,7 +24613,7 @@ markers in the source code editor.
DAP I/O Error
-
+ DAP Ein/AusgabefehlerPython Error
@@ -24638,7 +24657,7 @@ markers in the source code editor.
The system prevents loading of "%1", which is required for debugging. Make sure that your antivirus solution is up to date and if that does not work consider adding an exception for "%1".
-
+ Das System verhindert das Laden von "%1", welches für das Debuggen erforderlich ist. Stellen Sie sicher, dass Ihr Virenschutzprogramm aktuell ist. Falls dies nicht hilft, ziehen Sie in Betracht, eine Ausnahme für "%1" hinzuzufügen.Module loaded: %1
@@ -24688,7 +24707,7 @@ Installieren Sie das Paket "Qt Debug Information Files" für diese Qt-
Cannot read "%1": %2
- "%1" kann nicht gelesen werden: %2
+ "%1" kann nicht gelesen werden: %2Value %1 obtained from evaluating the condition of breakpoint %2, stopping.
@@ -25597,35 +25616,35 @@ Sie können hier eine andere Verbindung wählen, beispielsweise eine serielle Ve
Enable C++ debugger.
-
+ C++-Debugger aktivieren.Try to determine need for C++ debugger.
-
+ Versuche, die Notwendigkeit eines C++-Debuggers automatisch festzustellen.Enable QML debugger.
-
+ QML-Debugger aktivieren.Try to determine need for QML debugger.
-
+ Versuche, die Notwendigkeit eines QML-Debuggers automatisch festzustellen.Without additional startup commands.
-
+ Ohne zusätzliche Kommandos beim Start.With additional startup commands.
-
+ Mit zusätzlichen Kommandos beim Start.C++ debugger:
-
+ C++-Debugger:QML debugger:
-
+ QML-Debugger:Enable Debugging of Subprocesses
@@ -25661,7 +25680,7 @@ Sie können hier eine andere Verbindung wählen, beispielsweise eine serielle Ve
LLDB I/O Error
- LLDB-Ein/Ausgabefehler
+ LLDB Ein/AusgabefehlerThe LLDB process crashed some time after starting successfully.
@@ -25669,11 +25688,11 @@ Sie können hier eine andere Verbindung wählen, beispielsweise eine serielle Ve
An error occurred when attempting to write to the LLDB process. For example, the process may not be running, or it may have closed its input channel.
- Ein Fehler trat beim Versuch zum LLDB-Prozess zu schreiben auf. Möglicherweise läuft der Prozess nicht oder hat seinen Eingabekanal geschlossen.
+ Ein Fehler trat beim Versuch auf, zum LLDB-Prozess zu schreiben. Wahrscheinlich läuft der Prozess nicht oder hat seinen Eingabekanal geschlossen.An error occurred when attempting to read from the Lldb process. For example, the process may not be running.
- Ein Fehler trat beim Versuch vom Lldb-Prozess zu lesen auf. Möglicherweise läuft der Prozess nicht.
+ Ein Fehler trat beim Versuch auf, vom LLDB-Prozess zu lesen. Wahrscheinlich läuft der Prozess nicht.Use Local Symbol Cache
@@ -25746,15 +25765,15 @@ Sie können hier eine andere Verbindung wählen, beispielsweise eine serielle Ve
Generic
-
+ GenerischGDB from PATH on Build Device
-
+ GDB aus dem PATH des Build-GerätsLLDB from PATH on Build Device
-
+ LLDB aus dem PATH des Build-GerätsVersion:
@@ -26719,11 +26738,11 @@ Das Setzen von Haltepunkten anhand von Dateinamen und Zeilennummern könnte fehl
Default array size:
-
+ Standardgröße von Arrays:The number of array elements requested when expanding entries in the Locals and Expressions views.
-
+ Die Anzahl der angeforderten Array-Elemente, wenn Einträge in "Lokale Variablen & Ausdrücke" ausgeklappt werden.Shows QML object tree in Locals and Expressions when connected and not stepping.
@@ -27538,216 +27557,217 @@ Versuchen Sie, das Projekt neu zu erstellen.
QtC::DockerChecking docker daemon
-
+ Überprüfe Docker-DaemonPath "%1" is not a directory or does not exist.
-
+ Der Pfad "%1" ist kein Verzeichnis oder existiert nicht.Docker
-
+ DockerDocker Image
-
+ Docker ImageDocker Image "%1" (%2)
-
+ Docker Image "%1" (%2)Error starting remote shell. No container.
-
+ Fehler beim Start der entfernten Shell. Kein Container.Error starting remote shell: %1
-
+ Fehler beim Start der entfernten Shell: %1Open Shell in Container
-
+ Shell in Container öffnenDocker daemon appears to be not running. Verify daemon is up and running and reset the Docker daemon in Docker device preferences or restart Qt Creator.
-
+ Der Docker-Daemon scheint nicht zu laufen. Stellen Sie sicher, dass der Daemon ausgeführt wird, und setzen Sie den Docker-Daemon in den Einstellungen des Docker-Geräts zurück oder starten Sie Qt Creator neu.Docker Image Selection
-
+ Auswahl des Docker-ImageShow Unnamed Images
-
+ Unbenannte Images anzeigenLoading ...
-
+ Lade...Running "%1"
-
+ Führe "%1" aus
+Unexpected result: %1
-
+ Unerwartetes Ergebnis: %1Done.
- Fertig.
+ Fertig.Error: %1
- Fehler: %1
+ Fehler: %1Docker Device
-
+ Docker-GerätlocalSource: No mount point found for %1
-
+ localSource: Kein Einhängepunkt für %1 gefundenRepository:
- Repository:
+ Repository:Tag:
-
+ Tag:Image ID:
-
+ Image ID:Daemon state:
-
+ Daemon-Status:Clears detected daemon state. It will be automatically re-evaluated next time access is needed.
-
+ Löscht den festgestellten Daemon-Status. Wird automatisch neu ausgewertet, wenn das nächste Mal Zugriff benötigt wird.Do not modify entry point
-
+ Einstiegspunkt nicht ändernPrevents modifying the entry point of the image. Enable only if the image starts into a shell.
-
+ Verhindert, dass der Einstiegspunkt des Image geändert wird. Aktivieren Sie dies nur, wenn das Image in eine Shell gestartet wird.Enable flags needed for LLDB
-
+ Aktiviert Optionen, die für LLDB benötigt werdenAdds the following flags to the container to allow LLDB to run: --cap-add=SYS_PTRACE --security-opt seccomp=unconfined
-
+ Fügt die folgenden Optionen zum Start des Containers hinzu, um das Ausführen von LLDB zu erlauben: --cap-add=SYS_PTRACE --security-opt seccomp=unconfinedRun as outside user
-
+ Als Benutzer von außerhalb ausführenUses user ID and group ID of the user running Qt Creator in the docker container.
-
+ Verwendet im Docker-Container die Benutzer- und Gruppen-ID des Benutzers, der Qt Creator ausführt.Clangd Executable:
-
+ Ausführbare Datei für Clangd:Paths to mount:
-
+ Einzuhängende Pfade:Source directory list should not be empty.
-
+ Die Liste der Quellverzeichnisse sollte nicht leer sein.Host directories to mount into the container
-
+ Host-Verzeichnisse die in den Container eingehängt werden sollenMaps paths in this list one-to-one to the docker container.
-
+ Ordnet Pfade in dieser Liste 1-zu-1 zum Docker-Container zu.Auto-detect Kit Items
-
+ Kit-Einträge automatisch bestimmenRemove Auto-Detected Kit Items
-
+ Automatisch bestimmte Kit-Einträge entfernenList Auto-Detected Kit Items
-
+ Automatisch bestimmte Kit-Einträge anzeigenSearch in PATH
-
+ Im PATH suchenSearch in Selected Directories
-
+ In ausgewählten Verzeichnissen suchenSearch in PATH and Additional Directories
-
+ Im PATH und zusätzlichen Verzeichnissen suchenSemicolon-separated list of directories
-
+ Eine durch Semikola getrennte Liste von VerzeichnissenSelect the paths in the Docker image that should be scanned for kit entries.
-
+ Wählen Sie die Verzeichnisse im Docker-Image, in denen nach Kit-Einträgen gesucht werden sollen.Docker daemon appears to be stopped.
-
+ Der Docker-Daemon scheint angehalten zu sein.Docker daemon appears to be running.
-
+ Der Docker-Daemon scheint zu laufen.Detection complete.
-
+ Suche abgeschlossen.Search Locations:
-
+ Zu durchsuchende Orte:Detection log:
-
+ Suchprotokoll:Daemon state not evaluated.
-
+ Daemon-Status nicht ermittelt.Docker daemon running.
-
+ Docker-Daemon läuft.Docker daemon not running.
-
+ Docker-Daemon läuft nicht.Docker CLI
-
+ Docker CLICommand:
-
+ Kommando:Configuration
- Konfiguration
+ Konfiguration
@@ -28619,7 +28639,7 @@ zu deaktivieren, deaktiviert auch die folgenden Plugins:
Invalid regular expression.
-
+ Ungültiger regulärer Ausdruck."%1" %2 %3L, %4C written
@@ -28809,7 +28829,7 @@ zu deaktivieren, deaktiviert auch die folgenden Plugins:
Triggers a Fossil version control operation.
-
+ Führt eine Aktion des Fossil-Versionskontrollsystems aus.&Fossil
@@ -29117,7 +29137,7 @@ zu deaktivieren, deaktiviert auch die folgenden Plugins:
For example: "https://[user[:pass]@]host[:port]/[path]".
-
+ Zum Beispiel: "https://[user[:pass]@]host[:port]/[path]".Remember specified location as default
@@ -29176,7 +29196,7 @@ zu deaktivieren, deaktiviert auch die folgenden Plugins:
Remove Directory
-
+ Verzeichnis entfernenGeneric Manager
@@ -29184,11 +29204,11 @@ zu deaktivieren, deaktiviert auch die folgenden Plugins:
Project files list update failed.
-
+ Aktualisieren der Dateiliste des Projekts fehlgeschlagen.Build %1
-
+ %1 erstellen
@@ -29481,9 +29501,9 @@ Jetzt Commit ausführen?
Cannot commit %n file(s).
-
-
-
+
+ Der Commit einer Datei ist fehlgeschlagen.
+ Der Commit von %n Dateien ist fehlgeschlagen.
@@ -29838,7 +29858,7 @@ Jetzt Commit ausführen?
Annotate the current line in the editor with Git "blame" output.
-
+ Die aktuelle Zeile im Editor mit der Ausgabe von Git "blame" annotieren.Miscellaneous
@@ -30600,7 +30620,7 @@ Teilmarkiert - Zustand nicht verändern.
Pushes the selected commit and all commits it depends on.
-
+ Push des ausgewählten Commits und aller Commits, die davon abhängen.Supported on Gerrit 2.15 and later.
@@ -31384,271 +31404,271 @@ Hinweis: Dies macht Sie anfällig für Man-in-the-middle-Angriffe.
QtC::GitLabClone Repository
-
+ Repository klonenSpecify repository URL, checkout path and directory.
-
+ Geben Sie Repository-URL, Checkout-Pfad und Verzeichnis an.Repository
-
+ RepositoryPath
- Pfad
+ PfadPath "%1" already exists.
-
+ Der Pfad "%1" existiert bereits.Directory
- Verzeichnis
+ VerzeichnisRecursive
- Rekursiv
+ RekursivClone
- Klonen
+ KlonenUser canceled process.
-
+ Der Benutzer hat den Prozess abgebrochen.Cloning succeeded.
-
+ Das Klonen war erfolgreich.Warning
- Warnung
+ WarnungCloned project does not have a project file that can be opened. Try importing the project as a generic project.
-
+ Das geklonte Projekt enthält keine Projekt-Datei, die geöffnet werden kann. Versuchen Sie, das Projekt als generisches Projekt zu importieren.Open Project
- Projekt öffnen
+ Projekt öffnenChoose the project file to be opened.
-
+ Wählen Sie die zu öffnende Projekt-Datei.Cloning failed.
-
+ Fehler beim Klonen.GitLab
-
+ GitLabSearch
- Suche
+ Suche...
- ...
+ ...0
- 0
+ 0Clone...
- Klonen...
+ Klonen...Remote:
- Remote:
+ Remote:Not logged in.
-
+ Nicht eingeloggt.Insufficient access token.
-
+ Ungenügendes Zugangstoken.Permission scope read_api or api needed.
-
+ Es werden Rechte für read_api oder api benötigt.Check settings for misconfiguration.
-
+ Überprüfen Sie die Einstellungen auf falsche Konfigurationen.Projects (%1)
-
+ Projekte (%1)Using project access token.
-
+ Benutze das Zugriffstoken des Projekts.Logged in as %1
-
+ Als %1 eingeloggtId: %1 (%2)
-
+ ID: %1 (%2)Certificate Error
- Zertifikatsfehler
+ ZertifikatsfehlerServer certificate for %1 cannot be authenticated.
Do you want to disable SSL verification for this server?
Note: This can expose you to man-in-the-middle attack.
- Server-Zertifikat für %1 kann nicht authentifiziert werden.
+ Server-Zertifikat für %1 kann nicht authentifiziert werden.
Möchten Sie die SSL-Verifikation für diesen Server abschalten?
Hinweis: Dies macht Sie anfällig für Man-in-the-middle-Angriffe.Host:
- Host:
+ Host:Description:
- Beschreibung:
+ Beschreibung:Access token:
-
+ Zugriffstoken:Port:
- Port:
+ Port:HTTPS:
-
+ HTTPS:Default:
- Vorgabe:
+ Vorgabe:curl:
-
+ curl:Edit...
- Bearbeiten...
+ Bearbeiten...Edit current selected GitLab server configuration.
-
+ Ausgewählte GitLab-Serverkonfiguration bearbeiten.Remove
-
+ EntfernenRemove current selected GitLab server configuration.
-
+ Entferne die ausgewählte GitLab-Serverkonfiguration.Add...
- Hinzufügen...
+ Hinzufügen...Add new GitLab server configuration.
-
+ Neue GitLab-Serverkonfiguration hinzufügen.Edit Server...
-
+ Server bearbeiten...Modify
-
+ ÄndernAdd Server...
-
+ Server hinzufügen...Add
- Hinzufügen
+ HinzufügenGitLab...
-
+ GitLab...Error
- Fehler
+ FehlerInvalid GitLab configuration. For a fully functional configuration, you need to set up host name or address and an access token. Providing the path to curl is mandatory.
-
+ Ungültige GitLab-Konfiguration. Für eine voll funktionsfähige Konfiguration müssen Sie den Namen des Hosts oder die Adresse und ein Zugriffstoken einrichten. Die Angabe des Pfads zu curl ist zwingend erforderlich.Guest
-
+ GastReporter
-
+ ReporterDeveloper
-
+ EntwicklerMaintainer
-
+ MaintainerOwner
- Autor
+ EigentümerLinked GitLab Configuration:
-
+ Verbundene GitLab-Konfiguration:Link with GitLab
-
+ Mit GitLab verbindenUnlink from GitLab
-
+ Von GitLab trennenTest Connection
-
+ Verbindung testenProjects linked with GitLab receive event notifications in the Version Control output pane.
-
+ Mit GitLab verbundene Projekte erhalten Ereignisbenachrichtigungen in der Ausgabe der Versionskontrolle.Remote host does not match chosen GitLab configuration.
-
+ Der remote Host stimmt nicht mit der gewählten GitLab-Konfiguration überein.Accessible (%1).
-
+ Zugreifbar (%1).Read only access.
-
+ Schreibgeschützter Zugriff.Not a git repository.
-
+ Kein Git-Repository.Local git repository without remotes.
-
+ Lokales Git-Repository ohne Remotes.
@@ -31888,7 +31908,7 @@ Hinweis: Dies macht Sie anfällig für Man-in-the-middle-Angriffe.
Locates help topics, for example in the Qt documentation.
-
+ Findet Hilfethemen, zum Beispiel in der Qt-Dokumentation.Help
@@ -33151,7 +33171,7 @@ Fehler: %5
Team: %1
App ID: %2
Expiration date: %3
- Team: %1
+ Team: %1
App-ID: %2
Ablaufdatum: %3
@@ -33185,83 +33205,83 @@ Ablaufdatum: %3
iOS Settings
- iOS-Einstellungen
+ iOS-EinstellungenReset
- Zurücksetzen
+ ZurücksetzenAutomatically manage signing
- Signieren automatisch ausführen
+ Signieren automatisch verwaltenDevelopment team:
- Entwicklerteam:
+ Entwicklerteam:Provisioning profile:
- Provisioning-Profil:
+ Provisioning-Profil:Default
- Vorgabe
+ VorgabeNone
- Keine
+ KeineDevelopment team is not selected.
- Es ist kein Entwicklerteam ausgewählt.
+ Es ist kein Entwicklerteam ausgewählt.Provisioning profile is not selected.
- Es ist kein Provisioning-Profil ausgewählt.
+ Es ist kein Provisioning-Profil ausgewählt.Using default development team and provisioning profile.
- Die Vorgaben für Entwicklerteam und Provisioning-Profil werden benutzt.
+ Die Vorgaben für Entwicklerteam und Provisioning-Profil werden benutzt.Development team: %1 (%2)
- Entwicklerteam: %1 (%2)
+ Entwicklerteam: %1 (%2)Settings defined here override the QMake environment.
- Hier gewählte Einstellungen überschreiben die QMake-Umgebung.
+ Hier gewählte Einstellungen überschreiben die QMake-Umgebung.%1 not configured. Use Xcode and Apple developer account to configure the provisioning profiles and teams.
- %1 sind nicht konfiguriert. Benutzen Sie Xcode und Ihr Apple-Entwicklerkonto, um die Provisioning-Profile und Teams zu konfigurieren.
+ %1 sind nicht konfiguriert. Benutzen Sie Xcode und Ihr Apple-Entwicklerkonto, um die Provisioning-Profile und Teams zu konfigurieren.Development teams
- Entwicklerteams
+ EntwicklerteamsProvisioning profiles
- Provisioning-Profile
+ Provisioning-ProfileNo provisioning profile found for the selected team.
- Für das gewählte Team wurde kein Provisioning-Profil gefunden.
+ Für das gewählte Team wurde kein Provisioning-Profil gefunden.Provisioning profile expired. Expiration date: %1
- Das Provisioning-Profil ist abgelaufen. Ablaufdatum: %1
+ Das Provisioning-Profil ist abgelaufen. Ablaufdatum: %1Command:
-
+ Kommando:Arguments:
- Argumente:
+ Argumente:Reset to Default
- Auf Vorgabe zurücksetzen
+ Auf Vorgabe zurücksetzen
@@ -33280,7 +33300,7 @@ Ablaufdatum: %3
Locates symbols in the current document, based on a language server.
-
+ Findet Symbole im aktuellen Dokument, basierend auf einem Language Server.Symbols in Workspace
@@ -33288,7 +33308,7 @@ Ablaufdatum: %3
Locates symbols in the language server workspace.
-
+ Findet Symbole im Arbeitsbereich des Language Servers.Classes and Structs in Workspace
@@ -33296,7 +33316,7 @@ Ablaufdatum: %3
Locates classes and structs in the language server workspace.
-
+ Findet Klassen und Strukturen im Arbeitsbereich des Language Servers.Functions and Methods in Workspace
@@ -33304,7 +33324,7 @@ Ablaufdatum: %3
Locates functions and methods in the language server workspace.
-
+ Findet Funktionen und Methoden im Arbeitsbereich des Language Servers.Unexpectedly finished. Restarting in %1 seconds.
@@ -33428,15 +33448,15 @@ Beispiel: *.cpp%1*.h
shut downlanguage client state
-
+ abgeschaltetLanguage Server "%1" Initialization Error
-
+ Fehler beim Initialisieren von Language Server "%1"Initialization error: %1.
-
+ Fehler bei Initialisierung: %1.error
@@ -33524,7 +33544,7 @@ Beispiel: *.cpp%1*.h
Start typing to see replacements.
-
+ Beginne zu tippen, um Ersetzungen zu sehen.Expand All
@@ -33572,11 +33592,11 @@ Beispiel: *.cpp%1*.h
<Select>
-
+ <Auswählen>Language Server:
-
+ Language Server:Log
@@ -33604,7 +33624,7 @@ Beispiel: *.cpp%1*.h
Reloads the call hierarchy for the symbol under cursor position.
-
+ Lädt die Aufrufhierarchie für das Symbol unter der Einfügemarke neu.
@@ -34558,16 +34578,17 @@ Beispiel: *.cpp%1*.h
Wipe Project
-
+ Projekt bereinigenWipes build directory and reconfigures using previous command line options.
Useful if build directory is corrupted or when rebuilding with a newer version of Meson.
-
+ Löscht das Build-Verzeichnis und konfiguriert das Projekt erneut mit den vorherigen Kommandozeilenargumenten.
+Dies ist hilfreich, wenn das Build-Verzeichnis beschädigt ist oder das Projekt mit einer neuen Version von Meson neu erstellt werden soll.Parameters:
-
+ Parameter:Tool arguments:
@@ -34579,7 +34600,8 @@ Useful if build directory is corrupted or when rebuilding with a newer version o
Meson Build
-
+ name of the build step
+ Erstellen mit MesonConfigure
@@ -34612,7 +34634,7 @@ Useful if build directory is corrupted or when rebuilding with a newer version o
Configuring "%1".
- Konfiguriere "%1"
+ Konfiguriere "%1".Running %1 in %2.
@@ -34624,15 +34646,15 @@ Useful if build directory is corrupted or when rebuilding with a newer version o
Command is not executable: %1
-
+ Kommando ist nicht ausführbar: %1No Meson tool set.
-
+ Kein Meson-Werkzeug konfiguriert.No Ninja tool set.
-
+ Kein Ninja-Werkzeug konfiguriert.No compilers set in kit.
@@ -34640,19 +34662,19 @@ Useful if build directory is corrupted or when rebuilding with a newer version o
Autorun Meson
-
+ Meson automatisch ausführenAutomatically run Meson when needed.
-
+ Führt Meson bei Bedarf automatisch aus.Ninja verbose mode
-
+ Ausführlicher Ninja-ModusEnables verbose mode by default when invoking Ninja.
-
+ Aktiviert standardmäßig den ausführlichen Modus beim Ausführen von Ninja.General
@@ -34660,15 +34682,15 @@ Useful if build directory is corrupted or when rebuilding with a newer version o
Meson Tool
-
+ Meson-WerkzeugThe Meson tool to use when building a project with Meson.<br>This setting is ignored when using other build systems.
-
+ Das zum Erstellen eines Projektes mit Meson zu verwendende Meson-Werkzeug.<br>Diese Einstellung wird bei der Verwendung anderer Build-Systeme ignoriert.Cannot validate this meson executable.
-
+ Die Überprüfung der ausführbaren Meson-Datei ist fehlgeschlagen.Unconfigured
@@ -34684,7 +34706,7 @@ Useful if build directory is corrupted or when rebuilding with a newer version o
New Meson or Ninja tool
-
+ Neues Meson- oder Ninja-WerkzeugTools
@@ -34700,67 +34722,67 @@ Useful if build directory is corrupted or when rebuilding with a newer version o
Meson executable path does not exist.
-
+ Pfad für das Meson-Werkzeug existiert nicht.Meson executable path is not a file.
-
+ Pfad für das Meson-Werkzeug ist keine Datei.Meson executable path is not executable.
-
+ Pfad für das Meson-Werkzeug ist nicht ausführbar.Cannot get tool version.
-
+ Das Ermitteln der Werkzeug-Version ist fehlgeschlagen.Meson build: Parsing failed
-
+ Erstellen mit Meson: Fehler beim AuswertenNinja Tool
-
+ Ninja-WerkzeugThe Ninja tool to use when building a project with Meson.<br>This setting is ignored when using other build systems.
-
+ Das zum Erstellen eines Projektes mit Meson zu verwendende Ninja-Werkzeug.<br>Diese Einstellung wird bei der Verwendung anderer Build-Systeme ignoriert.Cannot validate this Ninja executable.
-
+ Die Überprüfung der ausführbaren Ninja-Datei ist fehlgeschlagen.Ninja
-
+ NinjaName:
- Name:
+ Name:Path:
- Pfad:
+ Pfad:Add
- Hinzufügen
+ HinzufügenClone
- Klonen
+ KlonenRemove
-
+ EntfernenMake Default
- Als Vorgabe setzen
+ Als Vorgabe setzenSet as the default Meson executable to use when creating a new kit or when no value is set.
-
+ Als vorgegebenes Meson-Werkzeug einstellen, das verwendet wird, wenn eine neues Kit erstellt wird oder kein Wert eingestellt ist.
@@ -34960,8 +34982,7 @@ Useful if build directory is corrupted or when rebuilding with a newer version o
Drop Node
- Eintrag fallen lassen
-
+ Eintrag fallen lassenSelect Custom Configuration Folder
@@ -35056,7 +35077,7 @@ Useful if build directory is corrupted or when rebuilding with a newer version o
Path:
- Pfad:
+ Pfad:Global
@@ -35098,27 +35119,27 @@ Useful if build directory is corrupted or when rebuilding with a newer version o
Nimble Build
-
+ Erstellen mit NimbleNimble Test
-
+ Nimble-TestNimble Task
-
+ Nimble-AufgabeTask arguments:
-
+ Aufgabenargumente:Tasks:
-
+ Aufgaben:Nimble task %1 not found.
-
+ Nimble-Aufgabe %1 wurde nicht gefunden.
@@ -35297,7 +35318,7 @@ Useful if build directory is corrupted or when rebuilding with a newer version o
Created trace points for: %1
- Tracepoints für %1 erzeugt.
+ Tracepoints für %1 erzeugtFailed to run trace point script: %1
@@ -35514,7 +35535,8 @@ Useful if build directory is corrupted or when rebuilding with a newer version o
The profiler did not produce any samples. Make sure that you are running a recent Linux kernel and that the "perf" utility is available and generates useful call graphs.
You might find further explanations in the Application Output view.
-
+ Der Profiler hat keine Samples geliefert. Stellen Sie sicher, dass Sie einen aktuellen Linux-Kernel verwenden und das Programm "perf" verfügbar ist und nutzbare Aufrufdiagramme erzeugt.
+Weitere Erklärungen sind möglicherweise in "Ausgabe der Anwendung" zu finden.A performance analysis is still in progress.
@@ -35534,7 +35556,7 @@ You might find further explanations in the Application Output view.
Trace File (*.ptq)
-
+ Trace-Datei (*.ptq)Show all addresses.
@@ -35562,19 +35584,19 @@ You might find further explanations in the Application Output view.
Failed to reset temporary trace file.
- Eine temporäre Trace-Datei konnte nicht zurückgesetzt werden.
+ Temporäre Trace-Datei konnte nicht zurückgesetzt werden.Failed to flush temporary trace file.
- Das Schreiben in eine temporäre Trace-Datei konnte nicht beendet werden.
+ Das Schreiben in eine temporäre Trace-Datei konnte nicht beendet werden.Cannot re-open temporary trace file.
- Eine temporäre Trace-Datei konnte nicht neu geöffnet werden.
+ Temporäre Trace-Datei konnte nicht neu geöffnet werden.Read past end from temporary trace file.
- Über das Ende der temporären Trace-Datei hinaus gelesen.
+ Über das Ende der temporären Trace-Datei hinaus gelesen.Thread started
@@ -35590,7 +35612,7 @@ You might find further explanations in the Application Output view.
Context switch
-
+ KontextwechselInvalid
@@ -35630,9 +35652,9 @@ You might find further explanations in the Application Output view.
%n frame(s)
-
-
-
+
+ Ein Frame
+ %n Frames
@@ -35665,7 +35687,7 @@ You might find further explanations in the Application Output view.
context switch
-
+ KontextwechselDuration
@@ -35693,11 +35715,11 @@ You might find further explanations in the Application Output view.
Invalid data format. The trace file's identification string is "%1". An acceptable trace file should have "%2". You cannot read trace files generated with older versions of %3.
-
+ Ungültiges Datenformat. Die Identifizierungszeichenfolge in der Trace-Datei ist "%1". Eine gültige Trace-Datei sollte "%2" enthalten. Sie können keine Trace-Dateien lesen, die mit älteren Versionen von %3 erstellt wurden.Invalid data format. The trace file was written with data stream version %1. We can read at most version %2. Please use a newer version of Qt.
-
+ Ungültiges Datenformat. Die Trace-Datei wurde mithilfe von Data Stream in der Version %1 geschrieben. Die höchste lesbare Version ist %2. Nutzen Sie bitte eine neuere Qt-Version.
@@ -35708,7 +35730,7 @@ You might find further explanations in the Application Output view.
Change number:
-
+ Change-Nummer:P4 Pending Changes
@@ -36001,19 +36023,19 @@ You might find further explanations in the Application Output view.
Close Submit Editor
-
+ Submit-Editor schließenClosing this editor will abort the submit.
-
+ Wenn Sie diesen Editor schließen, wird der Submit abgebrochen.Cannot submit.
-
+ Submit fehlgeschlagen.Cannot submit: %1.
-
+ Submit fehlgeschlagen: %1.p4 submit failed: %1
@@ -36253,7 +36275,7 @@ You might find further explanations in the Application Output view.
The build device failed to prepare for the build of %1 (%2).
- Das Build-Gerät konnte nicht für das Erstellen von %1 (%2) vorbereitet werden.
+ Das Gerät konnte nicht für das Erstellen von %1 (%2) vorbereitet werden.Compile
@@ -36395,7 +36417,7 @@ You might find further explanations in the Application Output view.
Locates files of all open projects. Append "+<number>" or ":<number>" to jump to the given line number. Append another "+<number>" or ":<number>" to jump to the column number as well.
-
+ Findet Dateien in allen geöffneten Projekten. Fügen Sie "+<Zahl>" oder ":<Zahl>" an, um zur angegebenen Zeile zu springen. Fügen Sie noch einmal "+<Zahl>" oder ":<Zahl>" an, um auch zur angegebenen Spalte zu springen.All Projects
@@ -36495,7 +36517,7 @@ Außer: %2
Locates files from the current document's project. Append "+<number>" or ":<number>" to jump to the given line number. Append another "+<number>" or ":<number>" to jump to the column number as well.
-
+ Findet Dateien im Projekt des aktuellen Dokuments. Fügen Sie "+<Zahl>" oder ":<Zahl>" an, um zur angegebenen Zeile zu springen. Fügen Sie noch einmal "+<Zahl>" oder ":<Zahl>" an, um auch zur angegebenen Spalte zu springen.Project "%1"
@@ -37215,23 +37237,23 @@ Bitte versuchen Sie es erneut.
Locates files from all project directories. Append "+<number>" or ":<number>" to jump to the given line number. Append another "+<number>" or ":<number>" to jump to the column number as well.
-
+ Findet Dateien in allen Projektverzeichnissen. Fügen Sie "+<Zahl>" oder ":<Zahl>" an, um zur angegebenen Zeile zu springen. Fügen Sie noch einmal "+<Zahl>" oder ":<Zahl>" an, um auch zur angegebenen Spalte zu springen.Run Run Configuration
-
+ Ausführungskonfiguration ausführenRuns a run configuration of the active project.
-
+ Führt eine Ausführungskonfiguration des aktiven Projekts aus.Switch Run Configuration
-
+ Ausführungskonfiguration auswählenSwitches the active run configuration of the active project.
-
+ Wechselt die aktive Ausführungskonfiguration des aktiven Projekts.Run %1
@@ -37869,7 +37891,7 @@ The name of the build configuration created by default for a generic project.
Environment:
- Umgebung:
+ Umgebung:No executable specified.
@@ -38167,12 +38189,12 @@ Aktivieren Sie dies, wenn Sie 32bit-x86-Binärdateien erstellen wollen, ohne ein
&Start Wizard to Add Device...
-
+ Gerät mit &Assistent hinzufügen...Add %1Add <Device Type Name>
-
+ %1 hinzufügenYes (id is "%1")
@@ -38475,7 +38497,7 @@ Aktivieren Sie dies, wenn Sie 32bit-x86-Binärdateien erstellen wollen, ohne ein
Show in Application Output when running
-
+ Beim Start in "Ausgabe der Anwendung" anzeigenNo device configured.
@@ -38756,7 +38778,7 @@ Bitte schließen Sie alle laufenden Instanzen Ihrer Anwendung vor dem Erstellen.
Ignoring invalid task (no text).
-
+ Ignoriere ungültige Aufgabe (kein Text).File Error
@@ -39036,47 +39058,57 @@ Bitte schließen Sie alle laufenden Instanzen Ihrer Anwendung vor dem Erstellen.
Creates a widget-based Qt application that contains a Qt Designer-based main window and C++ source and header files to implement the application logic.
Preselects a desktop Qt for building the application if available.
-
+ Erstellt eine Widget-basierte Qt-Anwendung mit einem Qt Designer-basierten Hauptfenster und C++-Quell- und Headerdateien zur Implementierung der Applikationslogik.
+
+Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern verfügbar.Creates a C++ library. You can create:<ul><li>a shared C++ library for use with <tt>QPluginLoader</tt> and runtime (Plugins)</li><li>a shared or static C++ library for use with another project at linktime</li></ul>
-
+ Erstellt eine C++-Bibliothek. Sie können folgendes erstellen:<ul><li>eine dynamisch gebundene C++-Bibliothek zur Verwendung mit <tt>QPluginLoader</tt> zur Laufzeit (Plugins)</li><li>eine statisch oder dynamisch gebundene C++-Bibliothek zur Verwendung in einem anderen Projekt zur Linkzeit</li></ul>Creates a project containing a single main.cpp file with a stub implementation and no graphical UI.
Preselects a desktop Qt for building the application if available.
-
+ Erstellt ein Projekt, das aus einer main.cpp-Datei mit einem Implementationsrumpf ohne grafische Benutzeroberfläche besteht.
+
+Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern verfügbar.PySide 2
- PySide 2
+ PySide 2Define Python Interpreter
-
+ Python-Interpreter festlegenCreates a Qt Quick application that contains an empty window.
Use this "compat" version if you want to use other build systems than CMake or Qt versions lower than 6.
-
+ Erstellt eine Qt Quick-Anwendung, die ein leeres Fenster enthält.
+
+Nutzen Sie diese "Kompatibilitätsversion", falls Sie andere Buildsysteme als CMake oder frühere Qt-Versionen als Qt 6 benutzen wollen.Qt Quick Application (compat)
-
+ Qt Quick-Anwendung (compat)Creates a Qt Quick UI project for previewing and prototyping designs.
To develop a full application, create a Qt Quick Application project instead.
-
+ Erstellt ein Qt Quick UI-Projekt für Vorschauen und Design-Prototypen.
+
+Für vollständige Anwendungen erstellen Sie stattdessen eine Qt Quick-Anwendung.Creates a Qt Quick application that can have both QML and C++ code. You can build the application and deploy it to desktop, embedded, and mobile target platforms.
You can select an option to create a project that you can open in Qt Design Studio, which has a visual editor for Qt Quick UIs.
-
+ Erstellt eine Qt Quick-Anwendung, die aus QML- und C++-Code bestehen kann. Unterstützt das Erstellen und Deployment der Anwendung für Desktop, Embedded und Mobile Zielplattformen.
+
+Wahlweise können Sie ein Projekt erstellen, das in Qt Design Studio geöffnet werden kann, welches einen visuellen Editor für Qt Quick-Benutzeroberflächen enthält.Qt Quick Application
@@ -39088,11 +39120,11 @@ You can select an option to create a project that you can open in Qt Design Stud
Boost Test (header only)
-
+ Boost Test (nur Header)Boost Test (shared libraries)
-
+ Boost Test (dynamisch gebundene Bibliotheken)Test framework:
@@ -39108,7 +39140,7 @@ You can select an option to create a project that you can open in Qt Design Stud
Boost install directory (optional):
-
+ Boost-Installationsverzeichnis (optional):Creates a new unit test project. Unit tests allow you to verify that the code is fit for use and that there are no regressions.
@@ -39136,11 +39168,11 @@ You can select an option to create a project that you can open in Qt Design Stud
Creates a markdown file.
-
+ Erzeugt eine Markdown-Datei.Markdown File
-
+ Markdown-DateiCreates a Java file with boilerplate code.
@@ -39198,27 +39230,29 @@ You can select an option to create a project that you can open in Qt Design Stud
You must tell Qt Creator which test framework is used inside the project.
You should not mix multiple test frameworks in a project.
-
+ Sie müssen Qt Creator mitteilen, welches Test-Framework im Projekt benutzt wird.
+
+Sie sollten nicht mehrere Test-Frameworks im selben Projekt mischen.%{JS: 'tst_' + value('TestCaseName').toLowerCase() + '.' + Util.preferredSuffix('text/x-c++src')}
-
+ %{JS: 'tst_' + value('TestCaseName').toLowerCase() + '.' + Util.preferredSuffix('text/x-c++src')}%{JS: 'tst_' + value('TestCaseName').toLowerCase() + '.qml'}
-
+ %{JS: 'tst_' + value('TestCaseName').toLowerCase() + '.qml'}Test Information
-
+ TestinformationCreates a source file that you can add to an existing test project.
-
+ Erstellt eine Quelldatei, die zu einem existierenden Testprojekt hinzugefügt werden kann.Test Case
-
+ TestfallCreates an empty Nim script file using UTF-8 charset.
@@ -39836,11 +39870,11 @@ You should not mix multiple test frameworks in a project.
Qt 6.4
- Qt 6.4
+ Qt 6.4Qt 6.5
- Qt 6.5
+ Qt 6.5The minimum version of Qt you want to build the application for.
@@ -39890,7 +39924,7 @@ You should not mix multiple test frameworks in a project.
Creates a CMake-based test project where you can enter a code snippet to compile and check it.
-
+ Erstellt ein CMake-basiertes Testprojekt, für welches Sie einen Code-Ausschnitt angegeben können, der erstellt und geprüft wird.Code Snippet
@@ -41019,7 +41053,7 @@ Was soll %1 tun?
Enter the path to the executable
-
+ Geben Sie den Pfad zur ausführbaren Datei einExecutable:
@@ -41051,7 +41085,7 @@ Was soll %1 tun?
Interpreter:
-
+ Interpreter:X11 Forwarding:
@@ -41217,7 +41251,7 @@ Was soll %1 tun?
The build directory is not reachable from the build device.
- Das Build-Verzeichnis kann auf dem Build-Gerät nicht erreicht werden.
+ Das Build-Verzeichnis kann auf dem Gerät nicht erreicht werden.Shadow build:
@@ -41333,7 +41367,7 @@ Was soll %1 tun?
Run device type
-
+ Gerätetyp (Ausführung)Unknown device type
@@ -41341,7 +41375,7 @@ Was soll %1 tun?
Run device
-
+ Gerät (Ausführung)The device to run the applications on.
@@ -41377,11 +41411,11 @@ Was soll %1 tun?
Device root directory
-
+ Wurzelverzeichnis des GerätsBuild device root directory
-
+ Wurzelverzeichnis des Geräts (Erstellung)Change...
@@ -41790,7 +41824,7 @@ fails because Clang does not understand the target architecture.
Build device
- Build-Gerät
+ Gerät (Erstellung)The device used to build applications on.
@@ -41798,27 +41832,27 @@ fails because Clang does not understand the target architecture.
No build device set.
- Kein Build-Gerät gesetzt.
+ Kein Gerät für die Erstellung gesetzt.Build host address
- Hostadresse des Build-Geräts
+ Hostadresse des Geräts (Erstellung)Build SSH port
- SSH-Port des Build-Geräts
+ SSH-Port des Geräts (Erstellung)Build user name
- Benutzername des Build-Geräts
+ Benutzername des Geräts (Erstellung)Build private key file
- Private Schlüsseldatei des Build-Geräts
+ Private Schlüsseldatei des Geräts (Erstellung)Build device name
- Build-Gerätename
+ Gerätename (Erstellung)Run as root user
@@ -41879,29 +41913,29 @@ fails because Clang does not understand the target architecture.
Source:
- Quelle:
+ Quelle:Target:
- Ziel:
+ Ziel:Copying failed.
-
+ Fehler beim Kopieren.Copying finished.
-
+ Kopieren beendet.Copy fileDefault CopyStep display name
-
+ Datei kopierenCopy directory recursivelyDefault CopyStep display name
-
+ Verzeichnis rekursiv kopieren
@@ -42001,23 +42035,23 @@ fails because Clang does not understand the target architecture.
%1 (Windowed)<python display name> (Windowed)
-
+ %1 (mit Fenster)Python interpreter:
-
+ Python-Interpreter:New Python Virtual Environment Directory
-
+ Neues Verzeichnis für virtuelle UmgebungVirtual environment directory:
-
+ Verzeichnis für virtuelle Umgebung:Create
-
+ ErstellenRemoving Python
@@ -42041,7 +42075,7 @@ fails because Clang does not understand the target architecture.
Install Python Packages
-
+ Python-Pakete installierenRunning "%1" to install %2.
@@ -42049,15 +42083,15 @@ fails because Clang does not understand the target architecture.
The installation of "%1" was canceled by timeout.
-
+ Die Installation von "%1" wurde wegen Zeitüberschreitung abgebrochen.The installation of "%1" was canceled by the user.
-
+ Die Installation von "%1" wurde vom Benutzer abgebrochen.Installing "%1" failed with exit code %2.
-
+ Die Installation von "%1" ist mit dem Rückgabewert %2 fehlgeschlagen.Run PySide6 project tool
@@ -42109,7 +42143,7 @@ fails because Clang does not understand the target architecture.
Create Virtual Environment
-
+ Virtuelle Umgebung erstellenManage Python Interpreters
@@ -42133,27 +42167,27 @@ fails because Clang does not understand the target architecture.
Create Python venv
-
+ Python venv erstellen"data" of a Python wizard page expects a map with "items" containing a list of objects.
-
+ "data" einer Python-Assistenzseite erwartet eine Zuordnung mit "items", die eine Liste aus Objekten enthält.An item of Python wizard page data expects a "trKey" field containing the UI visible string for that Python version and a "value" field containing an object with a "PySideVersion" field used for import statements in the Python files.
-
+ Ein Eintrag in den "items" im Feld "data" einer Python-Assistenzseite erwartet ein Feld "trKey", das den Anzeigenamen für diese Python-Version enthält, und ein Feld "value", das ein Objekt mit einem Feld "PySideVersion" enthält, das für import-Anweisungen in den Python-Dateien benutzt wird.PySide version:
- PySide-Version:
+ PySide-Version:Create new virtual environment
-
+ Neue virtuelle Umgebung erstellenPath to virtual environment:
-
+ Pfad zur virtuellen Umgebung:
@@ -42208,7 +42242,7 @@ fails because Clang does not understand the target architecture.
ABIs:
- ABIs:
+ ABIs:Parallel jobs:
@@ -42270,7 +42304,7 @@ fails because Clang does not understand the target architecture.
ProfileShadow build directory suffixNon-ASCII characters in directory suffix may cause build issues.
- Profile
+ ProfileQbs Build
@@ -42454,20 +42488,20 @@ fails because Clang does not understand the target architecture.
Reset
- Zurücksetzen
+ ZurücksetzenUse %1 settings directory for Qbs%1 == "Qt Creator" or "Qt Design Studio"
-
+ Das Verzeichnis für Einstellungen von %1 auch für Qbs benutzenPath to qbs executable:
-
+ Pfad zur ausführbaren qbs-Datei:Default installation directory:
-
+ Vorgabe-Installationsverzeichnis:Qbs version:
@@ -42475,7 +42509,7 @@ fails because Clang does not understand the target architecture.
Failed to retrieve version.
-
+ Die Version konnte nicht ermittelt werden.General
@@ -42483,54 +42517,56 @@ fails because Clang does not understand the target architecture.
Failed to run qbs config: %1
-
+ Das Ausführen von qbs config ist fehlgeschlagen: %1Received invalid input.
-
+ Ungültige Eingabe erhalten.No qbs executable was found, please set the path in the settings.
-
+ Es wurde keine ausführbare qbs-Datei gefunden, bitte setzen Sie den Pfad in den Einstellungen.The qbs executable was not found at the specified path, or it is not executable ("%1").
-
+ Die ausführbare qbs-Datei wurde am angegebenen Pfad nicht gefunden oder ist nicht ausführbar ("%1").The qbs process quit unexpectedly.
-
+ Der qbs-Prozess wurde unerwartet beendet.The qbs process failed to start.
-
+ Der qbs-Prozess konnte nicht gestartet werden.The qbs process sent unexpected data.
-
+ Der qbs-Prozess hat unerwartete Daten gesendet.The qbs API level is not compatible with what %1 expects.%1 == "Qt Creator" or "Qt Design Studio"
-
+ Der qbs-API-Level ist nicht mit dem von %1 erwarteten kompatibel.Request timed out.
-
+ Zeitüberschreitung bei der Anfrage.Failed to load qbs build graph.
-
+ Der qbs-Build-Graph konnte nicht geladen werden.The qbs session is not in a valid state.
-
+ Die qbs-Sitzung ist in keinem gültigen Zustand.Failed to update files in Qbs project: %1.
The affected files are:
%2
-
+ Das Aktualisieren von Dateien im Qbs-Projekt ist fehlgeschlagen: %1.
+Die betroffenen Dateien sind:
+ %2
@@ -44598,23 +44634,23 @@ Sie können eine Annotation "// @uri My.Module.Uri" hinzufügen, um de
Use customized static analyzer
-
+ Angepasste statische Analyse benutzenEnabled
- Aktiviert
+ AktiviertDisabled for non Qt Quick UI
-
+ Nur für Qt Quick UIMessage
-
+ NachrichtEnabled checks can be disabled for non Qt Quick UI files, but disabled checks cannot get explicitly enabled for non Qt Quick UI files.
-
+ Überprüfungen können für alle Dateien oder nur für Qt Quick UI-Dateien aktiviert werden. Es ist nicht möglich, Überprüfungen nur für Qt Quick UI-Dateien zu deaktivieren.Automatic Formatting on File Save
@@ -44630,11 +44666,11 @@ Sie können eine Annotation "// @uri My.Module.Uri" hinzufügen, um de
Static Analyzer
-
+ Statische AnalyseReset to Default
- Auf Vorgabe zurücksetzen
+ Auf Vorgabe zurücksetzenEnable auto format on file save
@@ -44717,7 +44753,7 @@ Sie können eine Annotation "// @uri My.Module.Uri" hinzufügen, um de
Locates QML functions in any open project.
-
+ Findet QML-Funktionen in allen offenen Projekten.Code Style
@@ -44741,7 +44777,7 @@ Sie können eine Annotation "// @uri My.Module.Uri" hinzufügen, um de
Other
- Andere
+ Andere&Line length:
@@ -44757,15 +44793,15 @@ Sie können eine Annotation "// @uri My.Module.Uri" hinzufügen, um de
QtC::QmlPreviewQML Preview
- QML-Vorschau
+ QML-VorschauPreview changes to QML code live in your application.
-
+ Zeigt Änderungen an QML-Code in Echtzeit in Ihrer Anwendung.Preview File
- Datei in Vorschau anzeigen
+ Datei in Vorschau anzeigen
@@ -45059,7 +45095,7 @@ Wollen Sie die Daten vorher speichern?
Quick3D
-
+ Quick3DFailed to replay QML events from stash file.
@@ -45530,135 +45566,135 @@ Speichern fehlgeschlagen.
Render Frame
-
+ Frame rendernSynchronize Frame
-
+ Frame synchronisierenPrepare Frame
-
+ Frame vorbereitenMesh Load
-
+ Mesh ladenCustom Mesh Load
-
+ Angepasstes Mesh ladenTexture Load
-
+ Textur ladenGenerate Shader
-
+ Shader generierenLoad Shader
-
+ Shader ladenParticle Update
-
+ Partikel aktualisierenRender Call
-
+ RenderaufrufRender Pass
-
+ RenderdurchgangEvent Data
-
+ EreignisdatenMesh Memory consumption
-
+ Mesh SpeicherbedarfTexture Memory consumption
-
+ Textur SpeicherbedarfMesh Unload
-
+ Mesh entladenCustom Mesh Unload
-
+ Angepasstes Mesh entladenTexture Unload
-
+ Textur entladenUnknown Unload Message %1
-
+ Unbekannte Entlade-Nachricht %1Description
- Beschreibung
+ BeschreibungCount
- Anzahl
+ AnzahlDraw Calls
-
+ Draw-AufrufeRender Passes
-
+ RenderdurchgängeTotal Memory Usage
-
+ Gesamter SpeicherverbrauchPrimitives
-
+ PrimitiveInstances
-
+ InstanzenFrame
- Frame
+ FrameFrame Delta
-
+ Frame DeltaView3D
-
+ View3DAll
- Alle
+ AlleNone
- Keine
+ KeineQuick3D Frame
-
+ Quick3D FrameSelect View3D
-
+ View3D auswählenCompare Frame
-
+ Frame vergleichen
@@ -48172,7 +48208,7 @@ Beschreibung: %4
Magnifier Tool
-
+ VergrößerungswerkzeugNavigator (Ctrl+E)
@@ -49641,211 +49677,211 @@ Failed to open file "%1"
QtC::TerminalConfigure...
- Einstellungen...
+ Einstellungen...Sends Esc to terminal instead of Qt Creator.
-
+ Sendet Escape zum Terminal statt zu Qt Creator.Press %1 to send Esc to terminal.
-
+ Drücken Sie %1, um Escape zum Terminal zu senden.Terminal
- Terminal
+ TerminalSends keyboard shortcuts to Terminal.
-
+ Sendet Tastenkombinationen zum Terminal.Sends keyboard shortcuts to Qt Creator.
-
+ Sendet Tastenkombinationen zu Qt Creator.New Terminal
-
+ Neues TerminalCreate a new Terminal.
-
+ Erstelle ein neues Terminal.Next Terminal
-
+ Nächstes TerminalPrevious Terminal
-
+ Vorangehendes TerminalClose the current Terminal.
-
+ Das aktuelle Terminal schließen.Devices
- Geräte
+ GeräteThe color used for %1.
-
+ Die für "%1" benutzte Farbe.Failed to open file.
-
+ Datei konnte nicht geöffnet werden.JSON parsing error: "%1", at offset: %2
-
+ Fehler beim Auswerten von JSON: "%1", an Position: %2No colors found.
-
+ Es wurden keine Farben gefunden.Invalid color format.
-
+ Ungültiges Farbformat.Unknown color scheme format.
-
+ Unbekanntes Farbschema-Format.Use internal terminal
-
+ Integriertes Terminal benutzenUses the internal terminal when "Run In Terminal" is enabled and for "Open Terminal here".
-
+ Benutzt das integrierte Terminal, wenn "Im Terminal ausführen" aktiviert ist und für "Terminalfenster hier öffnen".Family:
- Name:
+ Name:The font family used in the terminal.
-
+ Der Name der Zeichensatz-Familie, die im Terminal benutzt wird.Size:
- Größe:
+ Größe:The font size used in the terminal (in points).
-
+ Die Größe des Zeichensatzes, der im Terminal benutzt wird (in Punkten).Allow blinking cursor
-
+ Blinkenden Cursor erlaubenAllow the cursor to blink.
-
+ Erlaubt dem Cursor zu blinken.Shell path:
-
+ Shell-Pfad:The shell executable to be started.
-
+ Die ausführbare Datei der Shell, die gestartet werden soll.Shell arguments:
-
+ Shell-Argumente:The arguments to be passed to the shell.
-
+ Die Argumente, die an die Shell übergeben werden sollen.Send escape key to terminal
-
+ Escape-Taste zum Terminal sendenSends the escape key to the terminal when pressedinstead of closing the terminal.
-
+ Sendet die Escape-Taste zum Terminal, anstatt das Terminal zu schliessen.Audible bell
-
+ Akustische GlockeMakes the terminal beep when a bell character is received.
-
+ Lässt das Terminal piepen, wenn ein Glockenzeichen empfangen wird.Load Theme...
-
+ Thema laden...Reset Theme
-
+ Thema zurücksetzenError
- Fehler
+ FehlerGeneral
- Allgemein
+ AllgemeinFont
- Zeichensatz
+ ZeichensatzColors
-
+ FarbenForeground
-
+ ZeichenBackground
-
+ HintergrundSelection
- Auswahl
+ AuswahlFind match
-
+ FundstelleDefault Shell
-
+ Vorgabe-ShellCopy
- Kopieren
+ KopierenPaste
- Einfügen
+ EinfügenClear Selection
- Auswahl löschen
+ Auswahl löschenClear Terminal
-
+ Terminal-Inhalt löschenMove Cursor Word Left
-
+ Cursor ein Wort nach links bewegenMove Cursor Word Right
-
+ Cursor ein Wort nach rechts bewegenClose Terminal
-
+ Terminal schließen
@@ -50126,7 +50162,7 @@ Werte kleiner als 100% können überlappende und falsch ausgerichtete Darstellun
Failed to format: %1.
-
+ Formatieren fehlgeschlagen: %1.Cannot read file "%1": %2.
@@ -50138,7 +50174,7 @@ Werte kleiner als 100% können überlappende und falsch ausgerichtete Darstellun
Error in text formatting: %1
-
+ Fehler bei der Formatierung: %1Could not format file %1.
@@ -51159,7 +51195,7 @@ Bestimmt das Verhalten bezüglich der Einrückung von Fortsetzungszeilen.
Open Call Hierarchy
-
+ Aufrufhierarchie öffnenMove the View a Page Up and Keep the Cursor Position
@@ -51861,11 +51897,11 @@ Wird benutzt um die Funktion zu markieren, die ein gesuchtes Symbol benutzt.
Concept
-
+ KonzeptName of a concept.
-
+ Name eines Konzepts.Namespace
@@ -52436,7 +52472,7 @@ Außer Leerzeichen innerhalb von Kommentaren und Zeichenketten.
(type name READ name WRITE setName NOTIFY nameChanged FINAL)group:'C++' trigger:'Q_PROPERTY'
-
+ (type name READ name WRITE setName NOTIFY nameChanged FINAL)with targets
@@ -52518,15 +52554,15 @@ Außer Leerzeichen innerhalb von Kommentaren und Zeichenketten.
Show Preview
-
+ Vorschau anzeigenShow Editor
-
+ Editor anzeigenSwap Views
-
+ Ansichten tauschen
@@ -52923,15 +52959,15 @@ Die Trace-Daten sind verloren.
List of comma separated wildcard filters.
-
+ Kommaseparierte Liste von Platzhalter-Filtern. Files with file name or full file path matching any filter are included.
-
+ Dateien werden eingeschlossen, wenn ihr Name oder vollständiger Pfad einem der Filter entspricht.Files with file name or full file path matching any filter are excluded.
-
+ Dateien werden ausgeschlossen, wenn ihr Name oder vollständiger Pfad einem der Filter entspricht.Local
@@ -53168,7 +53204,7 @@ Die Trace-Daten sind verloren.
The program "%1" could not be found.
-
+ Das Programm "%1" wurde nicht gefunden.Process Not Responding
@@ -53248,7 +53284,7 @@ Die Trace-Daten sind verloren.
Cannot set permissions on temporary directory "%1": %2
-
+ Die Berechtigungen für das temporäre Verzeichnis "%1" konnten nicht gesetzt werden: %2Cannot create socket "%1": %2
@@ -53879,7 +53915,7 @@ in "%2" aus.
No clangd executable specified.
-
+ Es wurde keine ausführbare Datei für Clangd angegeben.Failed to retrieve clangd version: Unexpected clangd output.
@@ -53891,23 +53927,23 @@ in "%2" aus.
Failed to open temporary script file.
-
+ Die temporäre Script-Datei konnte nicht geöffnet werden.Failed to start terminal process: "%1".
-
+ Der Terminalprozess konnte nicht gestartet werden: "%1".Failed copying file.
-
+ Fehler beim Kopieren.Failed reading file.
-
+ Fehler beim Lesen der Datei.Failed writing file.
-
+ Fehler beim Schreiben der Datei.
@@ -54042,15 +54078,15 @@ in "%2" aus.
Valgrind Generic Settings
-
+ Generische Einstellungen für ValgrindMemcheck Memory Analysis Options
-
+ Einstellungen für die Memcheck SpeicheranalyseCallgrind Profiling Options
-
+ Einstellungen für den Callgrind ProfilerValgrind
@@ -54074,7 +54110,7 @@ in "%2" aus.
Extra Memcheck arguments:
-
+ Zusätzliche Memcheck-Argumente:Track origins of uninitialized memory
@@ -54082,7 +54118,7 @@ in "%2" aus.
Extra Callgrind arguments:
-
+ Zusätzliche Callgrind-Argumente:Limits the amount of results the profiler gives you. A lower limit will likely increase performance.
@@ -54102,7 +54138,7 @@ in "%2" aus.
Valgrind arguments:
-
+ Valgrind-ArgumenteEnable cache simulation
@@ -54117,7 +54153,14 @@ With cache simulation, further event counters are enabled:
<li>Data read accesses ("Dr") and related cache misses ("D1mr"/"D2mr").</li>
<li>Data write accesses ("Dw") and related cache misses ("D1mw"/"D2mw").</li></ul>
</p>
-
+ <p>Führt eine vollständige Cache-Simulation durch.</p>
+<p>Standardmäßig werden nur Instruction Read-Zugriffe gezählt ("Ir").</p>
+<p>
+Mit Cache-Simulation werden weitere Ereigniszähler aktiviert:
+<ul><li>Cache-Misses bei Instruction Reads ("I1mr"/"I2mr").</li>
+<li>Data Read-Zugriffe ("Dr") und entsprechende Cache-Misses ("D1mr"/"D2mr").</li>
+<li>Data Write-Zugriffe ("Dw") und entsprechende Cache-Misses ("D1mw"/"D2mw").</li></ul>
+</p>Enable branch prediction simulation
@@ -54130,7 +54173,13 @@ With cache simulation, further event counters are enabled:
"Bc"/"Bcm").</li>
<li>Executed indirect jumps and related misses of the jump address predictor (
"Bi"/"Bim").)</li></ul>
-
+ https://de.wikipedia.org/wiki/Sprungvorhersage
+ <p>Führt Branch Prediction-Simulation durch.</p>
+<p>Aktiviert weitere Ereigniszähler:</p>
+<ul><li>Anzahl der ausgeführten bedingten Verzweigungen und entsprechende Sprungvorhersagefehler (
+"Bc"/"Bcm").</li>
+<li>Ausgeführte indirekte Sprünge und entsprechende Fehler der Sprungadressenvorhersage (
+"Bi"/"Bim").)</li></ul>Collect system call time
@@ -54230,7 +54279,7 @@ With cache simulation, further event counters are enabled:
Failed opening temp file...
-
+ Temporäre Datei konnte nicht geöffnet werden...Function:
@@ -54723,7 +54772,8 @@ Wird ein Problem gefunden, dann wird die Anwendung angehalten und kann untersuch
Valgrind executable "%1" not found or not executable.
Check settings or ensure Valgrind is installed and available in PATH.
-
+ Die ausführbare Valgrind-Datei "%1" wurde nicht gefunden oder ist nicht ausführbar.
+Überprüfen Sie die Einstellungen und stellen Sie sicher, dass Valgrind installiert und im PATH verfügbar ist.Analyzing finished.
@@ -54761,7 +54811,7 @@ Check settings or ensure Valgrind is installed and available in PATH.
%1 (Called: %2; Incl. Cost: %3)
-
+ %1 (Aufgerufen: %2; Inkl. Kosten: %3)New
@@ -55455,19 +55505,19 @@ Check settings or ensure Valgrind is installed and available in PATH.
Close Commit Editor
-
+ Commit-Editor schließenClosing this editor will abort the commit.
-
+ Wenn Sie diesen Editor schließen, wird der Commit abgebrochen.Cannot commit.
-
+ Commit fehlgeschlagen.Cannot commit: %1.
-
+ Commit fehlgeschlagen: %1.Save before %1?
@@ -56013,8 +56063,7 @@ should a repository require SSH-authentication (see documentation on SSH and the
Canvas Diagrams
- Canvasdiagramme
-
+ CanvasdiagrammeItem
@@ -58238,7 +58287,7 @@ Are you sure you want to remove the material?
- Vcpkg
+ QtC::VcpkgSearch package...
diff --git a/src/libs/solutions/tasking/tasktree.cpp b/src/libs/solutions/tasking/tasktree.cpp
index ff43b3a6129..4e6b40ccc1e 100644
--- a/src/libs/solutions/tasking/tasktree.cpp
+++ b/src/libs/solutions/tasking/tasktree.cpp
@@ -1614,7 +1614,7 @@ void TaskNode::invokeEndHandler(bool success)
\endcode
The task tree above has a top level element of the Group type that contains
- tasks of the type ProcessTask, FileTransferTask, and ConcurrentCallTask.
+ tasks of the ProcessTask, FileTransferTask, and ConcurrentCallTask type.
After taskTree->start() is called, the tasks are run in a chain, starting
with ProcessTask. When the ProcessTask finishes successfully, the ConcurrentCallTask
task is started. Finally, when the asynchronous task finishes successfully, the
@@ -1765,7 +1765,7 @@ void TaskNode::invokeEndHandler(bool success)
\section2 Task's Start Handler
When a corresponding task class object is created and before it's started,
- the task tree invokes a mandatory user-provided setup handler. The setup
+ the task tree invokes an optionally user-provided setup handler. The setup
handler should always take a \e reference to the associated task class object:
\code
@@ -2150,7 +2150,7 @@ void TaskNode::invokeEndHandler(bool success)
\section1 Task Adapters
- To extend a TaskTree with new a task type, implement a simple adapter class
+ To extend a TaskTree with a new task type, implement a simple adapter class
derived from the TaskAdapter class template. The following class is an
adapter for a single shot timer, which may be considered as a new
asynchronous task:
@@ -2164,10 +2164,11 @@ void TaskNode::invokeEndHandler(bool success)
task()->setInterval(1000);
connect(task(), &QTimer::timeout, this, [this] { emit done(true); });
}
+ private:
void start() final { task()->start(); }
};
- QTC_DECLARE_CUSTOM_TASK(TimeoutTask, TimeoutTaskAdapter);
+ TASKING_DECLARE_TASK(TimeoutTask, TimeoutTaskAdapter);
\endcode
You must derive the custom adapter from the TaskAdapter class template
@@ -2178,12 +2179,12 @@ void TaskNode::invokeEndHandler(bool success)
accessible through the TaskAdapter::task() method. The constructor
of TimeoutTaskAdapter initially configures the QTimer object and connects
to the QTimer::timeout signal. When the signal is triggered, TimeoutTaskAdapter
- emits the done(true) signal to inform the task tree that the task finished
- successfully. If it emits done(false), the task finished with an error.
+ emits the \c done(true) signal to inform the task tree that the task finished
+ successfully. If it emits \c done(false), the task finished with an error.
The TaskAdapter::start() method starts the timer.
To make QTimer accessible inside TaskTree under the \e TimeoutTask name,
- register it with QTC_DECLARE_CUSTOM_TASK(TimeoutTask, TimeoutTaskAdapter).
+ register it with TASKING_DECLARE_TASK(TimeoutTask, TimeoutTaskAdapter).
TimeoutTask becomes a new task type inside Tasking namespace, using TimeoutTaskAdapter.
The new task type is now registered, and you can use it in TaskTree:
diff --git a/src/libs/utils/algorithm.h b/src/libs/utils/algorithm.h
index b75c0d5e4a0..2ea38377d8b 100644
--- a/src/libs/utils/algorithm.h
+++ b/src/libs/utils/algorithm.h
@@ -218,14 +218,6 @@ OutputContainer setUnionMerge(InputContainer1 &&input1,
template
OutputContainer setUnionMerge(InputContainer1 &&input1, InputContainer2 &&input2, Merge merge);
-/////////////////////////
-// usize / ssize
-/////////////////////////
-template
-std::make_unsigned_t usize(Container container);
-template
-std::make_signed_t ssize(Container container);
-
/////////////////////////
// setUnion
/////////////////////////
@@ -1340,15 +1332,15 @@ OutputContainer setUnionMerge(InputContainer1 &&input1,
}
template
-std::make_unsigned_t usize(Container container)
+auto usize(const Container &container)
{
- return static_cast>(container.size());
+ return static_cast>(std::size(container));
}
template
-std::make_signed_t ssize(Container container)
+auto ssize(const Container &container)
{
- return static_cast>(container.size());
+ return static_cast>(std::size(container));
}
template
diff --git a/src/libs/utils/aspects.cpp b/src/libs/utils/aspects.cpp
index 9bc51c7f530..b11e149c0d5 100644
--- a/src/libs/utils/aspects.cpp
+++ b/src/libs/utils/aspects.cpp
@@ -1611,7 +1611,7 @@ CheckableDecider BoolAspect::askAgainCheckableDecider()
{
return CheckableDecider(
[this] { return value(); },
- [this] { setValue(true); }
+ [this] { setValue(false); }
);
}
diff --git a/src/libs/utils/externalterminalprocessimpl.cpp b/src/libs/utils/externalterminalprocessimpl.cpp
index 2a316a22831..9ac01a7ee74 100644
--- a/src/libs/utils/externalterminalprocessimpl.cpp
+++ b/src/libs/utils/externalterminalprocessimpl.cpp
@@ -21,12 +21,11 @@ ProcessStubCreator::ProcessStubCreator(TerminalInterface *interface)
: m_interface(interface)
{}
-static const QLatin1String TerminalAppScript{R"(
+static const QLatin1String TerminalAppScriptAttached{R"(
tell application "Terminal"
activate
- set newTab to do script "echo Preparing terminal..."
+ set newTab to do script "%1 && exit"
set win to (the id of window 1 where its tab 1 = newTab) as text
- do script "%1 && exit" in newTab
repeat until ((count of processes of newTab) = 0)
delay 0.1
end repeat
@@ -34,14 +33,27 @@ static const QLatin1String TerminalAppScript{R"(
end tell
)"};
+static const QLatin1String TerminalAppScriptDetached{R"(
+ tell application "Terminal"
+ activate
+ do script "%1 && exit"
+ end tell
+)"};
+
+struct AppScript
+{
+ QString attached;
+ QString detached;
+};
+
expected_str ProcessStubCreator::startStubProcess(const ProcessSetupData &setupData)
{
const TerminalCommand terminal = TerminalCommand::terminalEmulator();
bool detached = setupData.m_terminalMode == TerminalMode::Detached;
if (HostOsInfo::isMacHost()) {
- static const QMap terminalMap = {
- {"Terminal.app", TerminalAppScript},
+ static const QMap terminalMap = {
+ {"Terminal.app", {TerminalAppScriptAttached, TerminalAppScriptDetached}},
};
if (terminalMap.contains(terminal.command.toString())) {
@@ -49,29 +61,36 @@ expected_str ProcessStubCreator::startStubProcess(const ProcessSetupData
= Utils::transform(setupData.m_environment.toStringList(), [](const QString &env) {
return CommandLine{"export", {env}}.toUserOutput();
}).join('\n');
- const QString shScript = QString("cd '%1'\n%2\nclear\n'%3' %4\n")
+
+ Process *process = new Process(detached ? nullptr : this);
+ if (detached) {
+ QObject::connect(process, &Process::done, process, &Process::deleteLater);
+ }
+
+ QTemporaryFile shFile;
+ shFile.setAutoRemove(false);
+ QTC_ASSERT(shFile.open(),
+ return make_unexpected(Tr::tr("Failed to open temporary script file.")));
+
+ const QString shScript = QString("cd '%1'\n%2\nclear\n'%3' %4\nrm '%5'\n")
.arg(setupData.m_workingDirectory.nativePath())
.arg(env)
.arg(setupData.m_commandLine.executable().nativePath())
- .arg(setupData.m_commandLine.arguments());
+ .arg(setupData.m_commandLine.arguments())
+ .arg(shFile.fileName());
- Process *process = new Process(detached ? nullptr : this);
- if (detached)
- QObject::connect(process, &Process::done, process, &Process::deleteLater);
+ shFile.write(shScript.toUtf8());
+ shFile.close();
- QTemporaryFile *shFile = new QTemporaryFile(process);
- QTC_ASSERT(shFile->open(),
- return make_unexpected(Tr::tr("Failed to open temporary script file.")));
- shFile->write(shScript.toUtf8());
- shFile->close();
-
- FilePath::fromUserInput(shFile->fileName())
+ FilePath::fromUserInput(shFile.fileName())
.setPermissions(QFile::ExeUser | QFile::ExeGroup | QFile::ExeOther | QFile::ReadUser
| QFile::ReadGroup | QFile::ReadOther | QFile::WriteUser
| QFile::WriteGroup | QFile::WriteOther);
- const QString script
- = terminalMap.value(terminal.command.toString()).arg(shFile->fileName());
+ const QString script = (detached
+ ? terminalMap.value(terminal.command.toString()).detached
+ : terminalMap.value(terminal.command.toString()).attached)
+ .arg(shFile.fileName());
process->setCommand({"osascript", {"-"}});
process->setWriteData(script.toUtf8());
diff --git a/src/plugins/autotest/qtest/qttestvisitors.h b/src/plugins/autotest/qtest/qttestvisitors.h
index 756ba17b9e2..dc18914b544 100644
--- a/src/plugins/autotest/qtest/qttestvisitors.h
+++ b/src/plugins/autotest/qtest/qttestvisitors.h
@@ -34,7 +34,7 @@ public:
private:
CppEditor::SymbolFinder m_symbolFinder;
QString m_className;
- const CPlusPlus::Snapshot &m_snapshot;
+ CPlusPlus::Snapshot m_snapshot;
QMap m_privSlots;
bool m_valid = false;
bool m_inherited = false;
diff --git a/src/plugins/autotest/quick/quicktestparser.cpp b/src/plugins/autotest/quick/quicktestparser.cpp
index a5acf697feb..4fa8d4fb81d 100644
--- a/src/plugins/autotest/quick/quicktestparser.cpp
+++ b/src/plugins/autotest/quick/quicktestparser.cpp
@@ -181,8 +181,9 @@ QList QuickTestParser::scanDirectoryForQuickTestQmlFiles(const Fi
QList foundDocs;
+ const Snapshot snapshot = QmlJSTools::Internal::ModelManager::instance()->snapshot();
for (const FilePath &path : std::as_const(dirs)) {
- const QList docs = m_qmlSnapshot.documentsInDirectory(path);
+ const QList docs = snapshot.documentsInDirectory(path);
for (const Document::Ptr &doc : docs) {
const FilePath fi = doc->fileName();
//const QFileInfo fi(doc->fileName());
diff --git a/src/plugins/autotest/testcodeparser.cpp b/src/plugins/autotest/testcodeparser.cpp
index e78be579651..dc76520dd3a 100644
--- a/src/plugins/autotest/testcodeparser.cpp
+++ b/src/plugins/autotest/testcodeparser.cpp
@@ -92,7 +92,7 @@ void TestCodeParser::syncTestFrameworks(const QList &parsers)
{
if (m_parserState != Idle) {
// there's a running parse
- m_postponedUpdateType = UpdateType::NoUpdate;
+ m_postponedUpdateType = UpdateType::FullUpdate;
m_postponedFiles.clear();
ProgressManager::cancelTasks(Constants::TASK_PARSE);
}
diff --git a/src/plugins/autotest/testprojectsettings.cpp b/src/plugins/autotest/testprojectsettings.cpp
index 5f745637db8..dd0c05079cc 100644
--- a/src/plugins/autotest/testprojectsettings.cpp
+++ b/src/plugins/autotest/testprojectsettings.cpp
@@ -4,7 +4,9 @@
#include "testprojectsettings.h"
#include "autotestconstants.h"
+#include "testcodeparser.h"
#include "testframeworkmanager.h"
+#include "testtreemodel.h"
#include
#include
@@ -49,7 +51,9 @@ void TestProjectSettings::activateFramework(const Id &id, bool activate)
{
ITestFramework *framework = TestFrameworkManager::frameworkForId(id);
m_activeTestFrameworks[framework] = activate;
- if (!activate)
+ if (TestTreeModel::instance()->parser()->isParsing())
+ framework->rootNode()->markForRemoval(!activate);
+ else if (!activate)
framework->resetRootNode();
}
diff --git a/src/plugins/autotest/testtreeitem.cpp b/src/plugins/autotest/testtreeitem.cpp
index f18adb812d4..69481b60cad 100644
--- a/src/plugins/autotest/testtreeitem.cpp
+++ b/src/plugins/autotest/testtreeitem.cpp
@@ -214,12 +214,16 @@ bool TestTreeItem::modifyLineAndColumn(const TestParseResult *result)
void TestTreeItem::markForRemoval(bool mark)
{
- m_status = mark ? MarkedForRemoval : Cleared;
+ if (type() == Root)
+ m_status = mark ? ForcedRootRemoval : NewlyAdded;
+ else
+ m_status = mark ? MarkedForRemoval : Cleared;
}
void TestTreeItem::markForRemovalRecursively(bool mark)
{
- markForRemoval(mark);
+ if (type() != Root)
+ markForRemoval(mark);
for (int row = 0, count = childCount(); row < count; ++row)
childItem(row)->markForRemovalRecursively(mark);
}
@@ -231,7 +235,8 @@ void TestTreeItem::markForRemovalRecursively(const QSet &filePaths)
child->markForRemovalRecursively(filePaths);
mark &= child->markedForRemoval();
});
- markForRemoval(mark);
+ if (type() != Root)
+ markForRemoval(mark);
}
TestTreeItem *TestTreeItem::childItem(int at) const
diff --git a/src/plugins/autotest/testtreeitem.h b/src/plugins/autotest/testtreeitem.h
index 3737d2a3607..4f4065c62d8 100644
--- a/src/plugins/autotest/testtreeitem.h
+++ b/src/plugins/autotest/testtreeitem.h
@@ -167,6 +167,7 @@ private:
{
NewlyAdded,
MarkedForRemoval,
+ ForcedRootRemoval, // only valid on rootNode
Cleared
};
diff --git a/src/plugins/autotest/testtreemodel.cpp b/src/plugins/autotest/testtreemodel.cpp
index 5e7fcb85a86..7d0dd3954d0 100644
--- a/src/plugins/autotest/testtreemodel.cpp
+++ b/src/plugins/autotest/testtreemodel.cpp
@@ -485,6 +485,10 @@ void TestTreeModel::markForRemoval(const QSet &filePaths)
void TestTreeModel::sweep()
{
for (TestTreeItem *frameworkRoot : frameworkRootNodes()) {
+ if (frameworkRoot->m_status == TestTreeItem::ForcedRootRemoval) {
+ frameworkRoot->framework()->resetRootNode();
+ continue;
+ }
sweepChildren(frameworkRoot);
revalidateCheckState(frameworkRoot);
}
diff --git a/src/plugins/beautifier/clangformat/clangformatsettings.cpp b/src/plugins/beautifier/clangformat/clangformatsettings.cpp
index 6a31667edb7..cd1f5e20d23 100644
--- a/src/plugins/beautifier/clangformat/clangformatsettings.cpp
+++ b/src/plugins/beautifier/clangformat/clangformatsettings.cpp
@@ -35,6 +35,7 @@ ClangFormatSettings::ClangFormatSettings()
usePredefinedStyle.setSettingsKey("usePredefinedStyle");
usePredefinedStyle.setLabelText(Tr::tr("Use predefined style:"));
+ usePredefinedStyle.setLabelPlacement(BoolAspect::LabelPlacement::AtCheckBoxWithoutDummyLabel);
usePredefinedStyle.setDefaultValue(true);
predefinedStyle.setSettingsKey("predefinedStyle");
diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
index 687758bb0ae..d7c94d81247 100644
--- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
+++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
@@ -59,26 +59,6 @@ void ClangEditorDocumentProcessor::semanticRehighlight()
BuiltinEditorDocumentProcessor::semanticRehighlight();
}
-bool ClangEditorDocumentProcessor::hasProjectPart() const
-{
- return !m_projectPart.isNull();
-}
-
-CppEditor::ProjectPart::ConstPtr ClangEditorDocumentProcessor::projectPart() const
-{
- return m_projectPart;
-}
-
-void ClangEditorDocumentProcessor::clearProjectPart()
-{
- m_projectPart.clear();
-}
-
-::Utils::Id ClangEditorDocumentProcessor::diagnosticConfigId() const
-{
- return m_diagnosticConfigId;
-}
-
void ClangEditorDocumentProcessor::setParserConfig(
const CppEditor::BaseEditorDocumentParser::Configuration &config)
{
diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.h b/src/plugins/clangcodemodel/clangeditordocumentprocessor.h
index aefbaa9e0ff..bd151554003 100644
--- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.h
+++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.h
@@ -19,12 +19,6 @@ public:
void semanticRehighlight() override;
- bool hasProjectPart() const;
- CppEditor::ProjectPart::ConstPtr projectPart() const;
- void clearProjectPart();
-
- ::Utils::Id diagnosticConfigId() const;
-
void setParserConfig(const CppEditor::BaseEditorDocumentParser::Configuration &config) override;
CppEditor::BaseEditorDocumentParser::Configuration parserConfig();
@@ -37,8 +31,6 @@ signals:
private:
TextEditor::TextDocument &m_document;
- CppEditor::ProjectPart::ConstPtr m_projectPart;
- ::Utils::Id m_diagnosticConfigId;
};
} // namespace Internal
diff --git a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
index a14fb81b901..98e855b4195 100644
--- a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
+++ b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
@@ -232,9 +232,7 @@ ClangModelManagerSupport::ClangModelManagerSupport()
connect(modelManager, &CppModelManager::abstractEditorSupportRemoved,
this, &ClangModelManagerSupport::onAbstractEditorSupportRemoved);
connect(modelManager, &CppModelManager::projectPartsUpdated,
- this, &ClangModelManagerSupport::onProjectPartsUpdated);
- connect(modelManager, &CppModelManager::projectPartsRemoved,
- this, &ClangModelManagerSupport::onProjectPartsRemoved);
+ this, &ClangModelManagerSupport::updateLanguageClient);
connect(modelManager, &CppModelManager::fallbackProjectPartUpdated, this, [this] {
if (sessionModeEnabled())
return;
@@ -861,37 +859,6 @@ void ClangModelManagerSupport::onTextMarkContextMenuRequested(TextEditor::TextEd
}
}
-using ClangEditorDocumentProcessors = QVector;
-static ClangEditorDocumentProcessors clangProcessors()
-{
- ClangEditorDocumentProcessors result;
- for (const CppEditorDocumentHandle *editorDocument : cppModelManager()->cppEditorDocuments())
- result.append(qobject_cast(editorDocument->processor()));
-
- return result;
-}
-
-void ClangModelManagerSupport::onProjectPartsUpdated(Project *project)
-{
- QTC_ASSERT(project, return);
-
- updateLanguageClient(project);
-
- QStringList projectPartIds;
- const ProjectInfo::ConstPtr projectInfo = cppModelManager()->projectInfo(project);
- QTC_ASSERT(projectInfo, return);
-
- for (const ProjectPart::ConstPtr &projectPart : projectInfo->projectParts())
- projectPartIds.append(projectPart->id());
- onProjectPartsRemoved(projectPartIds);
-}
-
-void ClangModelManagerSupport::onProjectPartsRemoved(const QStringList &projectPartIds)
-{
- if (!projectPartIds.isEmpty())
- reinitializeBackendDocuments(projectPartIds);
-}
-
void ClangModelManagerSupport::onClangdSettingsChanged()
{
const bool sessionMode = sessionModeEnabled();
@@ -940,21 +907,4 @@ void ClangModelManagerSupport::onClangdSettingsChanged()
}
}
-static ClangEditorDocumentProcessors
-clangProcessorsWithProjectParts(const QStringList &projectPartIds)
-{
- return ::Utils::filtered(clangProcessors(), [projectPartIds](ClangEditorDocumentProcessor *p) {
- return p->hasProjectPart() && projectPartIds.contains(p->projectPart()->id());
- });
-}
-
-void ClangModelManagerSupport::reinitializeBackendDocuments(const QStringList &projectPartIds)
-{
- const ClangEditorDocumentProcessors processors = clangProcessorsWithProjectParts(projectPartIds);
- for (ClangEditorDocumentProcessor *processor : processors) {
- processor->clearProjectPart();
- processor->run();
- }
-}
-
} // ClangCodeModel::Internal
diff --git a/src/plugins/clangcodemodel/clangmodelmanagersupport.h b/src/plugins/clangcodemodel/clangmodelmanagersupport.h
index 140239550d8..8121b9967a9 100644
--- a/src/plugins/clangcodemodel/clangmodelmanagersupport.h
+++ b/src/plugins/clangcodemodel/clangmodelmanagersupport.h
@@ -81,12 +81,8 @@ private:
int lineNumber,
QMenu *menu);
- void onProjectPartsUpdated(ProjectExplorer::Project *project);
- void onProjectPartsRemoved(const QStringList &projectPartIds);
void onClangdSettingsChanged();
- void reinitializeBackendDocuments(const QStringList &projectPartIds);
-
void connectTextDocumentToTranslationUnit(TextEditor::TextDocument *textDocument);
void connectToWidgetsMarkContextMenuRequested(QWidget *editorWidget);
diff --git a/src/plugins/clangcodemodel/clangtextmark.cpp b/src/plugins/clangcodemodel/clangtextmark.cpp
index 1a886c248ed..166a55e4f31 100644
--- a/src/plugins/clangcodemodel/clangtextmark.cpp
+++ b/src/plugins/clangcodemodel/clangtextmark.cpp
@@ -7,7 +7,6 @@
#include "clangconstants.h"
#include "clangdclient.h"
#include "clangdiagnostictooltipwidget.h"
-#include "clangeditordocumentprocessor.h"
#include "clangutils.h"
#include
@@ -49,46 +48,15 @@ Project *projectForCurrentEditor()
if (filePath.isEmpty())
return nullptr;
- if (auto processor = ClangEditorDocumentProcessor::get(filePath)) {
- if (ProjectPart::ConstPtr projectPart = processor->projectPart())
- return projectForProjectPart(*projectPart);
- }
+ if (ProjectPart::ConstPtr projectPart = projectPartForFile(filePath))
+ return projectForProjectPart(*projectPart);
return nullptr;
}
-enum class DiagnosticType { Clang, Tidy, Clazy };
-DiagnosticType diagnosticType(const ClangDiagnostic &diagnostic)
-
-{
- if (!diagnostic.disableOption.isEmpty())
- return DiagnosticType::Clang;
-
- const DiagnosticTextInfo textInfo(diagnostic.text);
- if (DiagnosticTextInfo::isClazyOption(textInfo.option()))
- return DiagnosticType::Clazy;
- return DiagnosticType::Tidy;
-}
-
void disableDiagnosticInConfig(ClangDiagnosticConfig &config, const ClangDiagnostic &diagnostic)
{
- switch (diagnosticType(diagnostic)) {
- case DiagnosticType::Clang:
- config.setClangOptions(config.clangOptions() + QStringList(diagnostic.disableOption));
- break;
- case DiagnosticType::Tidy:
- config.setChecks(ClangToolType::Tidy, config.checks(ClangToolType::Tidy) + QString(",-")
- + DiagnosticTextInfo(diagnostic.text).option());
- break;
- case DiagnosticType::Clazy: {
- const DiagnosticTextInfo textInfo(diagnostic.text);
- const QString checkName = DiagnosticTextInfo::clazyCheckName(textInfo.option());
- QStringList newChecks = config.checks(ClangToolType::Clazy).split(',');
- newChecks.removeOne(checkName);
- config.setChecks(ClangToolType::Clazy, newChecks.join(','));
- break;
- }
- }
+ config.setClangOptions(config.clangOptions() + QStringList(diagnostic.disableOption));
}
ClangDiagnosticConfig diagnosticConfig()
@@ -210,8 +178,10 @@ ClangDiagnostic convertDiagnostic(const ClangdDiagnostic &src,
target.severity = convertSeverity(*src.severity());
const Diagnostic::Code code = src.code().value_or(Diagnostic::Code());
const QString * const codeString = std::get_if(&code);
- if (codeString && codeString->startsWith("-W"))
+ if (codeString && codeString->startsWith("-W")) {
target.enableOption = *codeString;
+ target.disableOption = "-Wno-" + codeString->mid(2);
+ }
for (const CodeAction &codeAction : src.codeActions().value_or(QList())) {
const std::optional edit = codeAction.edit();
if (!edit)
@@ -304,15 +274,17 @@ ClangdTextMark::ClangdTextMark(TextEditor::TextDocument *doc,
actions << action;
// Remove diagnostic warning action
- Project *project = projectForCurrentEditor();
- if (project && isDiagnosticConfigChangable(project)) {
- action = new QAction();
- action->setIcon(Icons::BROKEN.icon());
- action->setToolTip(Tr::tr("Disable Diagnostic in Current Project"));
- QObject::connect(action, &QAction::triggered, [diag] {
- disableDiagnosticInCurrentProjectConfig(diag);
- });
- actions << action;
+ if (!diag.disableOption.isEmpty()) {
+ if (Project * const project = projectForCurrentEditor();
+ project && isDiagnosticConfigChangable(project)) {
+ action = new QAction();
+ action->setIcon(Icons::BROKEN.icon());
+ action->setToolTip(Tr::tr("Disable Diagnostic in Current Project"));
+ QObject::connect(action, &QAction::triggered, [diag] {
+ disableDiagnosticInCurrentProjectConfig(diag);
+ });
+ actions << action;
+ }
}
return actions;
});
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
index 9e4a705fb54..94f2bf912d6 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
@@ -16,6 +16,8 @@
#include
+#include
+
#include
#include
#include
@@ -185,7 +187,8 @@ static bool supportsStageForInstallation(const Kit *kit)
QTC_ASSERT(buildDevice, return false);
return runDevice->id() != buildDevice->id()
&& runDevice->type() != Android::Constants::ANDROID_DEVICE_TYPE
- && runDevice->type() != Ios::Constants::IOS_DEVICE_TYPE;
+ && runDevice->type() != Ios::Constants::IOS_DEVICE_TYPE
+ && runDevice->type() != WebAssembly::Constants::WEBASSEMBLY_DEVICE_TYPE;
}
CMakeBuildStep::CMakeBuildStep(BuildStepList *bsl, Id id) :
@@ -242,7 +245,7 @@ CMakeBuildStep::CMakeBuildStep(BuildStepList *bsl, Id id) :
env.set("NINJA_STATUS", ninjaProgressString + "%o/sec] ");
env.modify(m_userEnvironmentChanges);
- if (m_useStaging)
+ if (m_useStaging && m_useStaging->value())
env.set("DESTDIR", currentStagingDir());
});
diff --git a/src/plugins/cmakeprojectmanager/cmakeformatter.cpp b/src/plugins/cmakeprojectmanager/cmakeformatter.cpp
index dca6d47e203..8a727ba7942 100644
--- a/src/plugins/cmakeprojectmanager/cmakeformatter.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeformatter.cpp
@@ -60,10 +60,12 @@ public:
autoFormatOnlyCurrentProject.setSettingsKey("autoFormatOnlyCurrentProject");
autoFormatOnlyCurrentProject.setDefaultValue(true);
autoFormatOnlyCurrentProject.setLabelText(Tr::tr("Restrict to files contained in the current project"));
+ autoFormatOnlyCurrentProject.setLabelPlacement(BoolAspect::LabelPlacement::AtCheckBox);
autoFormatMime.setSettingsKey("autoFormatMime");
autoFormatMime.setDefaultValue("text/x-cmake");
autoFormatMime.setLabelText(Tr::tr("Restrict to MIME types:"));
+ autoFormatMime.setDisplayStyle(StringAspect::LineEditDisplay);
setLayouter([this] {
using namespace Layouting;
@@ -73,9 +75,12 @@ public:
Group {
title(Tr::tr("Automatic Formatting on File Save")),
autoFormatOnSave.groupChecker(),
- Form {
- autoFormatMime, br,
- Span(2, autoFormatOnlyCurrentProject)
+ // Conceptually, that's a Form, but this would look odd:
+ // xxxxxx [____]
+ // [x] xxxxxxxxxxxxxx
+ Column {
+ Row { autoFormatMime },
+ autoFormatOnlyCurrentProject
}
},
st
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp
index 4fef3bda467..a005bd79fa7 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp
@@ -379,8 +379,10 @@ static QMakeAndCMakePrefixPath qtInfoFromCMakeCache(const CMakeConfig &config,
args.push_back(qtcQMakeProbeDir.path().path());
args.push_back("-B");
args.push_back(qtcQMakeProbeDir.filePath("build").path());
- args.push_back("-G");
- args.push_back(cmakeGenerator);
+ if (!cmakeGenerator.isEmpty()) {
+ args.push_back("-G");
+ args.push_back(cmakeGenerator);
+ }
if (!cmakeGeneratorPlatform.isEmpty()) {
args.push_back("-A");
args.push_back(cmakeGeneratorPlatform);
@@ -708,8 +710,9 @@ QList CMakeProjectImporter::examineDirectory(const FilePath &importPath,
data->sysroot = cache.filePathValueOf("CMAKE_SYSROOT");
CMakeConfig config;
- if (cache.valueOf("CMAKE_C_COMPILER").isEmpty()
- && cache.valueOf("CMAKE_CXX_COMPILER").isEmpty()) {
+ const bool noCompilers = cache.valueOf("CMAKE_C_COMPILER").isEmpty()
+ && cache.valueOf("CMAKE_CXX_COMPILER").isEmpty();
+ if (noCompilers || !configurePreset.generator) {
QApplication::setOverrideCursor(Qt::WaitCursor);
config = configurationFromPresetProbe(importPath, projectDirectory(), configurePreset);
QApplication::restoreOverrideCursor();
@@ -751,6 +754,8 @@ QList CMakeProjectImporter::examineDirectory(const FilePath &importPath,
// Update QT_QMAKE_EXECUTABLE and CMAKE_C|XX_COMPILER config values
updateConfigWithDirectoryData(config, data);
+ data->hasQmlDebugging = CMakeBuildConfiguration::hasQmlDebugging(config);
+
QByteArrayList buildConfigurationTypes = {cache.valueOf("CMAKE_BUILD_TYPE")};
if (buildConfigurationTypes.front().isEmpty()) {
buildConfigurationTypes.clear();
@@ -771,6 +776,13 @@ QList CMakeProjectImporter::examineDirectory(const FilePath &importPath,
DirectoryData *newData = new DirectoryData(*data);
newData->cmakeBuildType = buildType;
+ // Handle QML Debugging
+ auto type = CMakeBuildConfigurationFactory::buildTypeFromByteArray(
+ newData->cmakeBuildType);
+ if (type == CMakeBuildConfigurationFactory::BuildTypeDebug
+ || type == CMakeBuildConfigurationFactory::BuildTypeProfile)
+ newData->hasQmlDebugging = true;
+
result.emplace_back(newData);
}
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
index 88cb4e168a7..7e2e854ab4b 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
@@ -246,6 +246,8 @@ void CMakeManager::reloadCMakePresets()
{QMessageBox::Yes, Tr::tr("Reload")},
});
+ settings->writeSettings(Core::ICore::settings());
+
if (clickedButton == QMessageBox::Cancel)
return;
diff --git a/src/plugins/cmakeprojectmanager/presetsparser.cpp b/src/plugins/cmakeprojectmanager/presetsparser.cpp
index f3be87f7ea8..f3f92f76fd5 100644
--- a/src/plugins/cmakeprojectmanager/presetsparser.cpp
+++ b/src/plugins/cmakeprojectmanager/presetsparser.cpp
@@ -296,6 +296,15 @@ bool parseConfigurePresets(const QJsonValue &jsonValue,
if (strategy == "external")
preset.architecture->strategy
= PresetsDetails::ValueStrategyPair::Strategy::external;
+ } else {
+ preset.architecture->strategy = PresetsDetails::ValueStrategyPair::Strategy::set;
+ }
+ } else {
+ const QString value = object.value("architecture").toString();
+ if (!value.isEmpty()) {
+ preset.architecture = PresetsDetails::ValueStrategyPair();
+ preset.architecture->value = value;
+ preset.architecture->strategy = PresetsDetails::ValueStrategyPair::Strategy::set;
}
}
@@ -311,6 +320,15 @@ bool parseConfigurePresets(const QJsonValue &jsonValue,
preset.toolset->strategy = PresetsDetails::ValueStrategyPair::Strategy::set;
if (strategy == "external")
preset.toolset->strategy = PresetsDetails::ValueStrategyPair::Strategy::external;
+ } else {
+ preset.toolset->strategy = PresetsDetails::ValueStrategyPair::Strategy::set;
+ }
+ } else {
+ const QString value = object.value("toolset").toString();
+ if (!value.isEmpty()) {
+ preset.toolset = PresetsDetails::ValueStrategyPair();
+ preset.toolset->value = value;
+ preset.toolset->strategy = PresetsDetails::ValueStrategyPair::Strategy::set;
}
}
diff --git a/src/plugins/copilot/copilotplugin.cpp b/src/plugins/copilot/copilotplugin.cpp
index 1a554e13977..bb5c80fa60f 100644
--- a/src/plugins/copilot/copilotplugin.cpp
+++ b/src/plugins/copilot/copilotplugin.cpp
@@ -74,7 +74,7 @@ void CopilotPlugin::initialize()
connect(requestAction, &QAction::triggered, this, [this] {
if (auto editor = TextEditor::TextEditorWidget::currentTextEditorWidget()) {
- if (m_client->reachable())
+ if (m_client && m_client->reachable())
m_client->requestCompletions(editor);
}
});
diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h
index 513d02eb6ee..2606628d266 100644
--- a/src/plugins/coreplugin/coreconstants.h
+++ b/src/plugins/coreplugin/coreconstants.h
@@ -143,6 +143,7 @@ const char G_HELP[] = "QtCreator.Group.Help";
// File menu groups
const char G_FILE_NEW[] = "QtCreator.Group.File.New";
const char G_FILE_OPEN[] = "QtCreator.Group.File.Open";
+const char G_FILE_SESSION[] = "QtCreator.Group.File.Recent";
const char G_FILE_PROJECT[] = "QtCreator.Group.File.Project";
const char G_FILE_SAVE[] = "QtCreator.Group.File.Save";
const char G_FILE_EXPORT[] = "QtCreator.Group.File.Export";
diff --git a/src/plugins/coreplugin/find/ifindfilter.cpp b/src/plugins/coreplugin/find/ifindfilter.cpp
index 85b8a68be80..66b7710586c 100644
--- a/src/plugins/coreplugin/find/ifindfilter.cpp
+++ b/src/plugins/coreplugin/find/ifindfilter.cpp
@@ -36,7 +36,7 @@
A common way to present the search results to the user, is to use the
shared \uicontrol{Search Results} pane.
- \image qtcreator-searchresults.png
+ \image qtcreator-search-results.webp {Search Results view}
If you want to implement a find filter that is doing a file based text
search, you should use \l Core::BaseTextFind, which already implements all
diff --git a/src/plugins/coreplugin/find/searchresultwindow.cpp b/src/plugins/coreplugin/find/searchresultwindow.cpp
index e2a83a71a0e..a096f452490 100644
--- a/src/plugins/coreplugin/find/searchresultwindow.cpp
+++ b/src/plugins/coreplugin/find/searchresultwindow.cpp
@@ -319,7 +319,7 @@ using namespace Core::Internal;
\brief The SearchResultWindow class is the implementation of a commonly
shared \uicontrol{Search Results} output pane.
- \image qtcreator-searchresults.png
+ \image qtcreator-search-results.webp {Search Results view}
Whenever you want to show the user a list of search results, or want
to present UI for a global search and replace, use the single instance
diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
index 846b5d9dea2..ee5138f62e8 100644
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -475,6 +475,7 @@ void MainWindow::registerDefaultContainers()
filemenu->menu()->setTitle(Tr::tr("&File"));
filemenu->appendGroup(Constants::G_FILE_NEW);
filemenu->appendGroup(Constants::G_FILE_OPEN);
+ filemenu->appendGroup(Constants::G_FILE_SESSION);
filemenu->appendGroup(Constants::G_FILE_PROJECT);
filemenu->appendGroup(Constants::G_FILE_SAVE);
filemenu->appendGroup(Constants::G_FILE_EXPORT);
diff --git a/src/plugins/coreplugin/progressmanager/progressview.cpp b/src/plugins/coreplugin/progressmanager/progressview.cpp
index 45b10286dc4..333df54a518 100644
--- a/src/plugins/coreplugin/progressmanager/progressview.cpp
+++ b/src/plugins/coreplugin/progressmanager/progressview.cpp
@@ -130,8 +130,8 @@ void ProgressView::mousePressEvent(QMouseEvent *ev)
static QPoint boundedInParent(QWidget *widget, const QPoint &pos, QWidget *parent)
{
QPoint bounded = pos;
- bounded.setX(qBound(widget->rect().width(), bounded.x(), parent->width()));
- bounded.setY(qBound(widget->rect().height(), bounded.y(), parent->height()));
+ bounded.setX(std::max(widget->rect().width(), std::min(bounded.x(), parent->width())));
+ bounded.setY(std::max(widget->rect().height(), std::min(bounded.y(), parent->height())));
return bounded;
}
diff --git a/src/plugins/coreplugin/session.cpp b/src/plugins/coreplugin/session.cpp
index 7238a09a2ee..7954b50e341 100644
--- a/src/plugins/coreplugin/session.cpp
+++ b/src/plugins/coreplugin/session.cpp
@@ -100,7 +100,7 @@ SessionManager::SessionManager()
ActionContainer *msession = ActionManager::createMenu(M_SESSION);
msession->menu()->setTitle(PE::Tr::tr("S&essions"));
msession->setOnAllDisabledBehavior(ActionContainer::Show);
- mfile->addMenu(msession, Core::Constants::G_FILE_OPEN);
+ mfile->addMenu(msession, Core::Constants::G_FILE_SESSION);
sb_d->m_sessionMenu = msession->menu();
connect(mfile->menu(), &QMenu::aboutToShow, this, [] { sb_d->updateSessionMenu(); });
@@ -609,6 +609,7 @@ bool SessionManager::loadSession(const QString &session, bool initial)
return true;
}
} else if (loadImplicitDefault) {
+ emit SessionManager::instance()->sessionLoaded(DEFAULT_SESSION);
return true;
}
diff --git a/src/plugins/cppeditor/cppcodemodelsettings.cpp b/src/plugins/cppeditor/cppcodemodelsettings.cpp
index d0976b8128d..7a32011cf54 100644
--- a/src/plugins/cppeditor/cppcodemodelsettings.cpp
+++ b/src/plugins/cppeditor/cppcodemodelsettings.cpp
@@ -492,6 +492,7 @@ void ClangdProjectSettings::setDiagnosticConfigId(Utils::Id configId)
{
m_customSettings.diagnosticConfigId = configId;
saveSettings();
+ emit ClangdSettings::instance().changed();
}
void ClangdProjectSettings::blockIndexing()
diff --git a/src/plugins/cppeditor/cpphighlighter.cpp b/src/plugins/cppeditor/cpphighlighter.cpp
index 656173feee2..f562d9afece 100644
--- a/src/plugins/cppeditor/cpphighlighter.cpp
+++ b/src/plugins/cppeditor/cpphighlighter.cpp
@@ -56,7 +56,8 @@ void CppHighlighter::highlightBlock(const QString &text)
const Tokens tokens = tokenize(text, initialLexerState);
lexerState = tokenize.state(); // refresh lexer state
- initialLexerState &= ~0x80; // discard newline expected bit
+ static const auto lexerStateWithoutNewLineExpectedBit = [](int state) { return state & ~0x80; };
+ initialLexerState = lexerStateWithoutNewLineExpectedBit(initialLexerState);
int foldingIndent = initialBraceDepth;
if (TextBlockUserData *userData = TextDocumentLayout::textUserData(currentBlock())) {
userData->setFoldingIndent(0);
@@ -220,7 +221,8 @@ void CppHighlighter::highlightBlock(const QString &text)
if (text.length() > lastTokenEnd)
formatSpaces(text, lastTokenEnd, text.length() - lastTokenEnd);
- if (!initialLexerState && lexerState && !tokens.isEmpty()) {
+ if (!initialLexerState && lexerStateWithoutNewLineExpectedBit(lexerState)
+ && !tokens.isEmpty()) {
const Token &lastToken = tokens.last();
if (lastToken.is(T_COMMENT) || lastToken.is(T_DOXY_COMMENT)) {
insertParen({Parenthesis::Opened, QLatin1Char('+'), lastToken.utf16charsBegin()});
@@ -636,6 +638,30 @@ void CppHighlighterTest::test()
QCOMPARE(actualFormat, expectedFormat);
}
}
+
+void CppHighlighterTest::testParentheses_data()
+{
+ QTest::addColumn("line");
+ QTest::addColumn("expectedParenCount");
+
+ QTest::newRow("function head") << 41 << 2;
+ QTest::newRow("function opening brace") << 42 << 1;
+ QTest::newRow("loop head") << 43 << 1;
+ QTest::newRow("comment") << 44 << 0;
+ QTest::newRow("loop end") << 45 << 3;
+ QTest::newRow("function closing brace") << 46 << 1;
+}
+
+void CppHighlighterTest::testParentheses()
+{
+ QFETCH(int, line);
+ QFETCH(int, expectedParenCount);
+
+ QTextBlock block = m_doc.findBlockByNumber(line - 1);
+ QVERIFY(block.isValid());
+ QCOMPARE(TextDocumentLayout::parentheses(block).count(), expectedParenCount);
+}
+
} // namespace Internal
#endif // WITH_TESTS
diff --git a/src/plugins/cppeditor/cpphighlighter.h b/src/plugins/cppeditor/cpphighlighter.h
index 1728ffeb777..e2fac20bba6 100644
--- a/src/plugins/cppeditor/cpphighlighter.h
+++ b/src/plugins/cppeditor/cpphighlighter.h
@@ -52,6 +52,8 @@ public:
private slots:
void test_data();
void test();
+ void testParentheses_data();
+ void testParentheses();
private:
QTextDocument m_doc;
diff --git a/src/plugins/cppeditor/testcases/highlightingtestcase.cpp b/src/plugins/cppeditor/testcases/highlightingtestcase.cpp
index 53ffcc1b55e..d1ec061aa29 100644
--- a/src/plugins/cppeditor/testcases/highlightingtestcase.cpp
+++ b/src/plugins/cppeditor/testcases/highlightingtestcase.cpp
@@ -37,3 +37,10 @@ const auto s5 = uR"("o
ne")"_w;
const auto s6 = u"o\
ne"_w;
+
+static void parenTest()
+{
+ do {
+ /* comment */ \
+ } while (false);
+}
diff --git a/src/plugins/debugger/debuggerrunconfigurationaspect.cpp b/src/plugins/debugger/debuggerrunconfigurationaspect.cpp
index 8cf92fe1da8..8811934aee4 100644
--- a/src/plugins/debugger/debuggerrunconfigurationaspect.cpp
+++ b/src/plugins/debugger/debuggerrunconfigurationaspect.cpp
@@ -155,7 +155,8 @@ bool DebuggerRunConfigurationAspect::useCppDebugger() const
static bool projectHasQmlDefines(ProjectExplorer::Project *project)
{
auto projectInfo = CppEditor::CppModelManager::instance()->projectInfo(project);
- QTC_ASSERT(projectInfo, return false);
+ if (!projectInfo) // we may have e.g. a Python project
+ return false;
return Utils::anyOf(projectInfo->projectParts(),
[](const CppEditor::ProjectPart::ConstPtr &part){
return Utils::anyOf(part->projectMacros, [](const Macro ¯o){
diff --git a/src/plugins/mcusupport/mcusupportplugin.cpp b/src/plugins/mcusupport/mcusupportplugin.cpp
index f0726e3895f..05f457689d8 100644
--- a/src/plugins/mcusupport/mcusupportplugin.cpp
+++ b/src/plugins/mcusupport/mcusupportplugin.cpp
@@ -89,9 +89,7 @@ void updateMCUProjectTree(ProjectExplorer::Project *p)
auto qmlProjectNode = std::make_unique(FilePath(node->filePath()),
inputsJsonFile);
- auto qmlProjectNodePtr = qmlProjectNode.get();
- const_cast(node)->addNode(std::move(qmlProjectNode));
- ProjectExplorer::ProjectTree::emitSubtreeChanged(qmlProjectNodePtr);
+ const_cast(node)->replaceSubtree(nullptr, std::move(qmlProjectNode));
});
};
diff --git a/src/plugins/mesonprojectmanager/mesonprojectparser.cpp b/src/plugins/mesonprojectmanager/mesonprojectparser.cpp
index c84b5e4b3d6..528865f3d37 100644
--- a/src/plugins/mesonprojectmanager/mesonprojectparser.cpp
+++ b/src/plugins/mesonprojectmanager/mesonprojectparser.cpp
@@ -183,7 +183,7 @@ QList MesonProjectParser::appsTargets() const
if (target.type == Target::Type::executable) {
ProjectExplorer::BuildTargetInfo bti;
bti.displayName = target.name;
- bti.buildKey = Target::fullName(m_srcDir, target);
+ bti.buildKey = Target::fullName(m_buildDir, target);
bti.displayNameUniquifier = bti.buildKey;
bti.targetFilePath = Utils::FilePath::fromString(target.fileName.first());
bti.workingDirectory = Utils::FilePath::fromString(target.fileName.first()).absolutePath();
@@ -237,7 +237,7 @@ void MesonProjectParser::update(const QFuture
m_rootNode = std::move(parserData->rootNode);
m_targetsNames.clear();
for (const Target &target : m_parserResult.targets) {
- m_targetsNames.push_back(Target::fullName(m_srcDir, target));
+ m_targetsNames.push_back(Target::fullName(m_buildDir, target));
}
addMissingTargets(m_targetsNames);
m_targetsNames.sort();
@@ -253,7 +253,7 @@ ProjectExplorer::RawProjectPart MesonProjectParser::buildRawPart(
{
ProjectExplorer::RawProjectPart part;
part.setDisplayName(target.name);
- part.setBuildSystemTarget(Target::fullName(m_srcDir, target));
+ part.setBuildSystemTarget(Target::fullName(m_buildDir, target));
part.setFiles(sources.sources + sources.generatedSources);
auto flags = splitArgs(sources.parameters);
part.setMacros(flags.macros);
diff --git a/src/plugins/mesonprojectmanager/ninjabuildstep.cpp b/src/plugins/mesonprojectmanager/ninjabuildstep.cpp
index ac41aeecfaa..0cb71186bdd 100644
--- a/src/plugins/mesonprojectmanager/ninjabuildstep.cpp
+++ b/src/plugins/mesonprojectmanager/ninjabuildstep.cpp
@@ -59,6 +59,7 @@ QWidget *NinjaBuildStep::createConfigWidget()
buildTargetsList->setFrameShadow(QFrame::Raised);
auto toolArguments = new QLineEdit(widget);
+ toolArguments->setText(m_commandArgs);
auto wrapper = Core::ItemViewFind::createSearchableWrapper(buildTargetsList,
Core::ItemViewFind::LightColored);
diff --git a/src/plugins/mesonprojectmanager/target.h b/src/plugins/mesonprojectmanager/target.h
index 1efa3669490..bc137eee90a 100644
--- a/src/plugins/mesonprojectmanager/target.h
+++ b/src/plugins/mesonprojectmanager/target.h
@@ -60,15 +60,17 @@ struct Target
const std::optional subproject;
const SourceGroupList sources;
- static inline QString fullName(const Utils::FilePath &srcDir, const Target &target)
+ static inline QString fullName(const Utils::FilePath &buildDir, const Target &target)
{
using namespace Utils;
- if (FilePath::fromString((target.fileName.first())).isAbsolutePath()) {
- const auto fname = target.fileName.first().split('/').last();
- QString definedIn = FilePath::fromString(target.definedIn).absolutePath().toString();
- return definedIn.remove(srcDir.toString()) + '/' + fname;
+ auto fname = target.fileName.first();
+ if (FilePath::fromString(fname).isAbsolutePath()) {
+ fname.remove(buildDir.toString());
+ if (fname.startsWith('/'))
+ fname.remove(0, 1);
+ return fname;
} else {
- return target.fileName.first();
+ return fname;
}
}
diff --git a/src/plugins/nim/project/nimcompilerbuildstep.cpp b/src/plugins/nim/project/nimcompilerbuildstep.cpp
index 588098619a2..76802a85df8 100644
--- a/src/plugins/nim/project/nimcompilerbuildstep.cpp
+++ b/src/plugins/nim/project/nimcompilerbuildstep.cpp
@@ -60,7 +60,7 @@ QWidget *NimCompilerBuildStep::createConfigWidget()
auto additionalArgumentsLineEdit = new QLineEdit(widget);
auto commandTextEdit = new QTextEdit(widget);
- commandTextEdit->setEnabled(false);
+ commandTextEdit->setReadOnly(true);
commandTextEdit->setMinimumSize(QSize(0, 0));
auto defaultArgumentsComboBox = new QComboBox(widget);
diff --git a/src/plugins/nim/project/nimtoolchainfactory.cpp b/src/plugins/nim/project/nimtoolchainfactory.cpp
index 01ec5373b55..415e7e76962 100644
--- a/src/plugins/nim/project/nimtoolchainfactory.cpp
+++ b/src/plugins/nim/project/nimtoolchainfactory.cpp
@@ -83,7 +83,7 @@ NimToolChainConfigWidget::NimToolChainConfigWidget(NimToolChain *tc)
fillUI();
// Connect
- connect(m_compilerCommand, &PathChooser::textChanged, this, [this] {
+ connect(m_compilerCommand, &PathChooser::validChanged, this, [this] {
const FilePath path = m_compilerCommand->rawFilePath();
auto tc = static_cast(toolChain());
QTC_ASSERT(tc, return);
diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp
index 27e29e497e8..93e13f71f0c 100644
--- a/src/plugins/qmakeprojectmanager/qmakestep.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp
@@ -510,9 +510,9 @@ QWidget *QMakeStep::createConfigWidget()
widget, [this] { qtVersionChanged(); });
connect(abisListWidget, &QListWidget::itemChanged, this, [this] {
- abisChanged();
- if (QmakeBuildConfiguration *bc = qmakeBuildConfiguration())
- BuildManager::buildLists({bc->cleanSteps()});
+ if (m_ignoreChanges.isLocked())
+ return;
+ handleAbiWidgetChange();
});
connect(widget, &QObject::destroyed, this, [this] {
@@ -654,6 +654,8 @@ void QMakeStep::askForRebuild(const QString &title)
void QMakeStep::updateAbiWidgets()
{
+ const GuardLocker locker(m_ignoreChanges);
+
if (!abisLabel)
return;
@@ -702,7 +704,7 @@ void QMakeStep::updateAbiWidgets()
item->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemIsSelectable);
item->setCheckState(selectedAbis.contains(param) ? Qt::Checked : Qt::Unchecked);
}
- abisChanged();
+ handleAbiWidgetChange();
}
}
@@ -711,6 +713,13 @@ void QMakeStep::updateEffectiveQMakeCall()
m_effectiveCall->setValue(effectiveQMakeCall());
}
+void QMakeStep::handleAbiWidgetChange()
+{
+ abisChanged();
+ if (QmakeBuildConfiguration *bc = qmakeBuildConfiguration())
+ BuildManager::buildLists({bc->cleanSteps()});
+}
+
void QMakeStep::recompileMessageBoxFinished(int button)
{
if (button == QMessageBox::Yes) {
diff --git a/src/plugins/qmakeprojectmanager/qmakestep.h b/src/plugins/qmakeprojectmanager/qmakestep.h
index f72c48d4612..d977eedd904 100644
--- a/src/plugins/qmakeprojectmanager/qmakestep.h
+++ b/src/plugins/qmakeprojectmanager/qmakestep.h
@@ -155,6 +155,7 @@ private:
void updateAbiWidgets();
void updateEffectiveQMakeCall();
+ void handleAbiWidgetChange();
Utils::CommandLine m_qmakeCommand;
Utils::CommandLine m_makeCommand;
diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp
index e0fda6b367c..e1468ca86e4 100644
--- a/src/plugins/qmldesigner/designmodewidget.cpp
+++ b/src/plugins/qmldesigner/designmodewidget.cpp
@@ -256,26 +256,18 @@ void DesignModeWidget::setup()
// Connect opening of the 'workspaces' menu with creation of the workspaces menu
connect(mworkspaces->menu(), &QMenu::aboutToShow, this, &DesignModeWidget::aboutToShowWorkspaces);
- Core::ActionContainer *mpanes = Core::ActionManager::actionContainer(Core::Constants::M_VIEW_PANES);
-
// Initially disable menus
- mviews->menu()->setEnabled(false);
mworkspaces->menu()->setEnabled(false);
- mpanes->menu()->setEnabled(false);
// Enable/disable menus when mode is different to MODE_DESIGN
connect(Core::ModeManager::instance(),
&Core::ModeManager::currentModeChanged,
this,
- [mviews, mworkspaces, mpanes](Utils::Id mode, Utils::Id) {
+ [mworkspaces](Utils::Id mode, Utils::Id) {
if (mode == Core::Constants::MODE_DESIGN) {
- mviews->menu()->setEnabled(true);
mworkspaces->menu()->setEnabled(true);
- mpanes->menu()->setEnabled(true);
} else {
- mviews->menu()->setEnabled(false);
mworkspaces->menu()->setEnabled(false);
- mpanes->menu()->setEnabled(false);
}
});
diff --git a/src/plugins/qtsupport/examplesparser.cpp b/src/plugins/qtsupport/examplesparser.cpp
index d115dcf3fe0..9093241001e 100644
--- a/src/plugins/qtsupport/examplesparser.cpp
+++ b/src/plugins/qtsupport/examplesparser.cpp
@@ -306,15 +306,19 @@ expected_str> parseExamples(const QByteArray &manifestData,
Q_GLOBAL_STATIC_WITH_ARGS(QList,
defaultOrder,
{QStringList() << "Application Examples"
- << "Desktop"
- << "Mobile"
- << "Embedded"
- << "Graphics"
- << "Input/Output"
- << "Connectivity"
- << "Networking"
- << "Positioning & Location"
- << "Internationalization"});
+ << "Desktop"
+ << "Mobile"
+ << "Embedded"
+ << "Graphics & Multimedia"
+ << "Graphics"
+ << "Data Visualization & 3D"
+ << "Data Processing & I/O"
+ << "Input/Output"
+ << "Connectivity"
+ << "Networking"
+ << "Positioning & Location"
+ << "Web Technologies"
+ << "Internationalization"});
static bool sortByHighlightedAndName(ExampleItem *first, ExampleItem *second)
{
diff --git a/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp b/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp
index 1be0624490f..07880089de2 100644
--- a/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp
+++ b/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp
@@ -38,7 +38,7 @@ public:
auto fetchButton = new QPushButton(Tr::tr("Fetch Device Environment"));
addWidget(fetchButton);
- connect(target, &Target::kitChanged, [aspect] { aspect->setRemoteEnvironment({}); });
+ connect(target, &Target::kitChanged, aspect, [aspect] { aspect->setRemoteEnvironment({}); });
connect(fetchButton, &QPushButton::clicked, this, [aspect, target] {
if (IDevice::ConstPtr device = DeviceKitAspect::device(target->kit())) {
diff --git a/src/plugins/texteditor/texteditoroverlay.cpp b/src/plugins/texteditor/texteditoroverlay.cpp
index ca15ff256bf..c5155008926 100644
--- a/src/plugins/texteditor/texteditoroverlay.cpp
+++ b/src/plugins/texteditor/texteditoroverlay.cpp
@@ -340,8 +340,8 @@ void TextEditorOverlay::paint(QPainter *painter, const QRect &clip)
: m_editor->blockCount() - 1;
auto overlapsClip = [&](const OverlaySelection &selection) {
- return selection.m_cursor_end.blockNumber() >= firstBlockNumber
- && selection.m_cursor_begin.blockNumber() <= lastBlockNumber;
+ return selection.m_cursor_end.blockNumber() + 1 >= firstBlockNumber
+ && selection.m_cursor_begin.blockNumber() - 1 <= lastBlockNumber;
};
for (int i = m_selections.size() - 1; i >= 0; --i) {
diff --git a/src/plugins/vcpkg/vcpkgtr.h b/src/plugins/vcpkg/vcpkgtr.h
index 0914ce6444d..90e107bb7d4 100644
--- a/src/plugins/vcpkg/vcpkgtr.h
+++ b/src/plugins/vcpkg/vcpkgtr.h
@@ -9,7 +9,7 @@ namespace Vcpkg {
struct Tr
{
- Q_DECLARE_TR_FUNCTIONS(Vcpkg)
+ Q_DECLARE_TR_FUNCTIONS(QtC::Vcpkg)
};
} // namespace Vcpkg
diff --git a/src/share/3rdparty/package-manager/auto-setup.cmake b/src/share/3rdparty/package-manager/auto-setup.cmake
index 4689cc98049..60c21440449 100644
--- a/src/share/3rdparty/package-manager/auto-setup.cmake
+++ b/src/share/3rdparty/package-manager/auto-setup.cmake
@@ -16,6 +16,17 @@ if (QT_CREATOR_SKIP_PACKAGE_MANAGER_SETUP)
endif()
option(QT_CREATOR_SKIP_PACKAGE_MANAGER_SETUP "Skip Qt Creator's package manager auto-setup" OFF)
+macro(qtc_auto_setup_compiler_standard toolchainFile)
+ foreach(lang_var C CXX CUDA OBJC OBJCXX)
+ foreach(prop_var STANDARD STANDARD_REQUIRED EXTENSIONS)
+ if (CMAKE_${lang_var}_${prop_var})
+ file(APPEND "${toolchainFile}"
+ "set(CMAKE_${lang_var}_${prop_var} ${CMAKE_${lang_var}_${prop_var}})\n")
+ endif()
+ endforeach()
+ endforeach()
+endmacro()
+
#
# conan
#
@@ -77,6 +88,8 @@ macro(qtc_auto_setup_conan)
set(CMAKE_C_COMPILER \"${CMAKE_C_COMPILER}\")
set(CMAKE_CXX_COMPILER \"${CMAKE_CXX_COMPILER}\")
")
+ qtc_auto_setup_compiler_standard("${CMAKE_BINARY_DIR}/conan-dependencies/toolchain.cmake")
+
if (CMAKE_TOOLCHAIN_FILE)
file(APPEND "${CMAKE_BINARY_DIR}/conan-dependencies/toolchain.cmake"
"include(\"${CMAKE_TOOLCHAIN_FILE}\")\n")
@@ -175,6 +188,8 @@ macro(qtc_auto_setup_vcpkg)
set(CMAKE_C_COMPILER \"${CMAKE_C_COMPILER}\")
set(CMAKE_CXX_COMPILER \"${CMAKE_CXX_COMPILER}\")
")
+ qtc_auto_setup_compiler_standard("${CMAKE_BINARY_DIR}/vcpkg-dependencies/toolchain.cmake")
+
if (CMAKE_TOOLCHAIN_FILE AND NOT
CMAKE_TOOLCHAIN_FILE STREQUAL "${CMAKE_BINARY_DIR}/vcpkg-dependencies/toolchain.cmake")
file(APPEND "${CMAKE_BINARY_DIR}/vcpkg-dependencies/toolchain.cmake"
diff --git a/src/shared/json/json.qbs b/src/shared/json/json.qbs
index 99726f7d68d..060e1bda9db 100644
--- a/src/shared/json/json.qbs
+++ b/src/shared/json/json.qbs
@@ -3,7 +3,7 @@ import qbs
StaticLibrary {
name: "qtcjson"
Depends { name: "cpp" }
- cpp.cxxLanguageVersion: "c++11"
+ cpp.cxxLanguageVersion: "c++17"
cpp.minimumMacosVersion: project.minimumMacosVersion
files: [
"json.cpp",
diff --git a/src/shared/qbs b/src/shared/qbs
index 97769dfdacd..d75d1e8f1a1 160000
--- a/src/shared/qbs
+++ b/src/shared/qbs
@@ -1 +1 @@
-Subproject commit 97769dfdacd006f4d82b240371e3ca79d445ab7a
+Subproject commit d75d1e8f1a18fd77ec9b80724c6d30ad6b8e064e
diff --git a/src/tools/sdktool/sdkpersistentsettings.cpp b/src/tools/sdktool/sdkpersistentsettings.cpp
index 34b139e2324..7fda2d8d03c 100644
--- a/src/tools/sdktool/sdkpersistentsettings.cpp
+++ b/src/tools/sdktool/sdkpersistentsettings.cpp
@@ -130,7 +130,7 @@ static QString resolveSymlinks(QString current)
while (links--) {
const QFileInfo info(current);
if (!info.isSymLink())
- return {};
+ return current;
current = info.symLinkTarget();
}
return current;
diff --git a/tests/manual/haskell/simple/stack.yaml b/tests/manual/haskell/simple/stack.yaml
index 9f5c8c628b2..4b8c90d83d1 100644
--- a/tests/manual/haskell/simple/stack.yaml
+++ b/tests/manual/haskell/simple/stack.yaml
@@ -15,7 +15,7 @@
# resolver:
# name: custom-snapshot
# location: "./custom-snapshot.yaml"
-resolver: lts-7.24
+resolver: lts-21.1
# User packages to be built.
# Various formats can be used as shown in the example below.
diff --git a/tests/system/objects.map b/tests/system/objects.map
index 97d44b7ed26..cc359d6b7fc 100644
--- a/tests/system/objects.map
+++ b/tests/system/objects.map
@@ -22,7 +22,7 @@
:Add Bookmark.treeView_QTreeView {type='QTreeView' unnamed='1' visible='1' window=':Add Bookmark_BookmarkDialog'}
:Add Bookmark_BookmarkDialog {type='BookmarkDialog' unnamed='1' visible='1' windowTitle='Add Bookmark'}
:Add to Version Control.No_QPushButton {text='No' type='QPushButton' unnamed='1' visible='1' window=':Add to Version Control_QMessageBox'}
-:Add to Version Control_QMessageBox {type='QMessageBox' unnamed='1' visible='1' windowTitle='Add to Version Control'}
+:Add to Version Control_QMessageBox {text~='Add the file\n.+\nto version control .+' type='QMessageBox' unnamed='1' visible='1'}
:Analyzer Toolbar.AnalyzerManagerToolBox_QComboBox {container=':DebugModeWidget.Toolbar_QDockWidget' name='PerspectiveChooser' type='QComboBox' visible='1'}
:Analyzer Toolbar.Clear_QToolButton {container=':DebugModeWidget.Toolbar_QDockWidget' toolTip='Discard data' type='QToolButton' unnamed='1' visible='1'}
:Analyzer Toolbar.Elapsed:_QLabel {container=':DebugModeWidget.Toolbar_QDockWidget' text~='Elapsed: \\\\d+.\\\\d s' type='QLabel' unnamed='1' visible='1'}
@@ -192,7 +192,7 @@
:Send to Codepaster.protocolBox_QComboBox {name='protocolBox' type='QComboBox' visible='1' window=':Send to Codepaster_CodePaster::PasteView'}
:Send to Codepaster.qt_spinbox_lineedit_QLineEdit {name='qt_spinbox_lineedit' type='QLineEdit' visible='1' window=':Send to Codepaster_CodePaster::PasteView'}
:Send to Codepaster_CodePaster::PasteView {name='CodePaster.ViewDialog' type='QDialog' visible='1' windowTitle='Send to Codepaster'}
-:Session Manager_ProjectExplorer::Internal::SessionDialog {name='ProjectExplorer.SessionDialog' type='ProjectExplorer::Internal::SessionDialog' visible='1' windowTitle='Session Manager'}
+:Session Manager_ProjectExplorer::Internal::SessionDialog {name='ProjectExplorer.SessionDialog' type='Core::Internal::SessionDialog' visible='1'}
:Startup.contextHelpComboBox_QComboBox {container=':Form.Startup_QGroupBox' name='contextHelpComboBox' type='QComboBox' visible='1'}
:User Interface.languageBox_QComboBox {name='languageBox' type='QComboBox' visible='1'}
:Utils::FakeToolTip {type='Utils::FakeToolTip' unnamed='1' visible='1'}
diff --git a/tests/system/shared/qtcreator.py b/tests/system/shared/qtcreator.py
index 8ad3a7eccf9..0b86001529f 100644
--- a/tests/system/shared/qtcreator.py
+++ b/tests/system/shared/qtcreator.py
@@ -45,8 +45,9 @@ def __closeInfoBarEntry__(leftButtonText):
leftWidget = "leftWidget={%s}" % (toolButton % leftButtonText)
test.log("closing %s" % leftButtonText)
buttonObjStr = "{%s %s}" % (doNotShowAgain, leftWidget)
+ checkIfObjectExists(buttonObjStr, verboseOnFail=True)
clickButton(waitForObject(buttonObjStr))
- waitFor('object.exists(buttonObjStr) == False', 2000)
+ checkIfObjectExists(buttonObjStr, False, 2000, True)
# additionalParameters must be a list or tuple of strings or None
def startQC(additionalParameters=None, withPreparedSettingsPath=True, closeLinkToQt=True, cancelTour=True):
diff --git a/tests/system/shared/utils.py b/tests/system/shared/utils.py
index 6b99c8959da..8639c6e2651 100644
--- a/tests/system/shared/utils.py
+++ b/tests/system/shared/utils.py
@@ -171,6 +171,10 @@ def invokeMenuItem(menu, item, *subItems):
numberedPrefix = "%d | "
for subItem in subItems:
# we might have numbered sub items (e.g. "Recent Files") - these have this special prefix
+ # but on macOS we don't add these prefixes
+ if platform.system() == 'Darwin' and subItem.startswith(numberedPrefix):
+ subItem = subItem[5:]
+
if subItem.startswith(numberedPrefix):
triggered = False
for i in range(1, 10):
@@ -186,7 +190,10 @@ def invokeMenuItem(menu, item, *subItems):
"Function arguments: '%s', '%s', %s" % (menu, item, str(subItems)))
break # we failed to trigger - no need to process subItems further
else:
+ noAmpersandItem = item.replace('&', '')
+ waitForObject("{type='QMenu' title='%s'}" % noAmpersandItem, 2000)
itemObject = waitForObjectItem(itemObject, subItem)
+ waitFor("itemObject.enabled", 2000)
activateItem(itemObject)
@@ -604,8 +611,12 @@ def stringify(obj):
if isinstance(obj, stringTypes):
return obj
if isinstance(obj, bytes):
- tmp = obj.decode('cp1252') if platform.system() in ('Microsoft','Windows') else obj.decode()
- return tmp
+ if not platform.system() in ('Microsoft', 'Windows'):
+ return obj.decode()
+ try:
+ return obj.decode('cp1252')
+ except UnicodeDecodeError:
+ return obj.decode('utf-8')
class GitClone:
diff --git a/tests/system/suite_HELP/tst_HELP02/test.py b/tests/system/suite_HELP/tst_HELP02/test.py
index e7e201c4948..8b6c32b7ded 100644
--- a/tests/system/suite_HELP/tst_HELP02/test.py
+++ b/tests/system/suite_HELP/tst_HELP02/test.py
@@ -3,6 +3,14 @@
source("../../shared/qtcreator.py")
+if platform.system() == 'Darwin':
+ keysToType = ''
+ expectedKeys = 'Cmd+Opt+A'
+else:
+ keysToType = ''
+ expectedKeys = 'Ctrl+Alt+A'
+
+
# test Qt Creator version information from file and dialog
def getQtCreatorVersionFromDialog():
chk = re.search("(?<=Qt Creator)\s\d+.\d+.\d+[-\w]*",
@@ -68,17 +76,16 @@ def setKeyboardShortcutForAboutQtC():
"visible='1' text~='(Stop Recording|Record)'}" % shortcutGB)
shortcut = ("{container=%s type='Utils::FancyLineEdit' unnamed='1' visible='1' "
"placeholderText='Enter key sequence as text'}" % shortcutGB)
- expected = 'Ctrl+Opt+A' if platform.system() == 'Darwin' else 'Ctrl+Alt+A'
clickButton(record)
- nativeType("")
- waitFor("_shortcutMatches_(shortcut, expected)", 5000)
+ nativeType(keysToType)
+ waitFor("_shortcutMatches_(shortcut, expectedKeys)", 5000)
clickButton(record)
- gotExpectedShortcut = _shortcutMatches_(shortcut, expected)
+ gotExpectedShortcut = _shortcutMatches_(shortcut, expectedKeys)
if not gotExpectedShortcut and platform.system() == 'Darwin':
test.warning("Squish Issue: shortcut was set to %s - entering it manually now"
% waitForObject(shortcut).text)
- replaceEditorContent(shortcut, expected)
+ replaceEditorContent(shortcut, expectedKeys)
else:
test.verify(gotExpectedShortcut, "Expected key sequence is displayed.")
clickButton(waitForObject(":Options.OK_QPushButton"))
@@ -97,7 +104,7 @@ def main():
waitForObject(":Qt Creator.QtCreator.MenuBar_QMenuBar", 2000)
except:
nativeMouseClick(waitForObject(":Qt Creator_Core::Internal::MainWindow", 1000), 20, 20, 0, Qt.LeftButton)
- nativeType("")
+ nativeType(keysToType)
# verify qt creator version
try:
waitForObject(":About Qt Creator_Core::Internal::VersionDialog", 5000)
diff --git a/tests/system/suite_SCOM/tst_SCOM04/test.py b/tests/system/suite_SCOM/tst_SCOM04/test.py
index 038c8a7a2e6..6351f4216e6 100644
--- a/tests/system/suite_SCOM/tst_SCOM04/test.py
+++ b/tests/system/suite_SCOM/tst_SCOM04/test.py
@@ -8,7 +8,7 @@ source("../../shared/suites_qtta.py")
def main():
# expected error texts - for different compilers
expectedErrorAlternatives = ["'SyntaxError' was not declared in this scope",
- "\xe2\x80\x98SyntaxError\xe2\x80\x99 was not declared in this scope",
+ u"\u2018SyntaxError\u2019 was not declared in this scope",
"'SyntaxError' : undeclared identifier", # MSVC2013
"'SyntaxError': undeclared identifier", # MSVC2015
"use of undeclared identifier 'SyntaxError'",
diff --git a/tests/system/suite_WELP/tst_WELP03/test.py b/tests/system/suite_WELP/tst_WELP03/test.py
index 3b60d15a2e2..7c672464eb3 100644
--- a/tests/system/suite_WELP/tst_WELP03/test.py
+++ b/tests/system/suite_WELP/tst_WELP03/test.py
@@ -18,10 +18,18 @@ def handlePackagingMessageBoxes():
except:
break
-def openExample(examplesLineEdit, input, exampleRegex, exampleName):
+
+def openExample(examplesLineEdit, input, exampleRegex, exampleName, waitForChildCount=0):
replaceEditorContent(examplesLineEdit, input)
listView = waitForObject("{type='QListView' unnamed='1' visible='1' "
"window=':Qt Creator_Core::Internal::MainWindow'}")
+ if waitForChildCount > 0:
+
+ def childCount(view):
+ return len(__childrenOfType__(view, 'QModelIndex'))
+
+ waitFor("childCount(listView) == waitForChildCount", 3000)
+
waitFor('findExampleOrTutorial(listView, exampleRegex) is not None', 3000)
example = findExampleOrTutorial(listView, exampleRegex, True)
if test.verify(example is not None, "Verifying: Example (%s) is shown." % exampleName):
@@ -100,7 +108,7 @@ def main():
removePackagingDirectory(os.path.dirname(p))
examplesLineEdit = waitForObject(search %(expect[1][0], expect[1][1]))
example = openExample(examplesLineEdit, "address book", "(0000 )?Address Book.*",
- "Address Book Example")
+ "Address Book Example", 3)
if example is not None:
# close second example application
test.verify(checkIfObjectExists("{column='0' container=':Qt Creator_Utils::NavigationTreeView'"
diff --git a/tests/system/suite_debugger/tst_qml_locals/test.py b/tests/system/suite_debugger/tst_qml_locals/test.py
index 525f45f95fa..37ecb515cc6 100644
--- a/tests/system/suite_debugger/tst_qml_locals/test.py
+++ b/tests/system/suite_debugger/tst_qml_locals/test.py
@@ -48,9 +48,13 @@ def main():
earlyExit("Could not find expected Inspector tree inside Locals and Expressions.")
return
# reduce items to outer Rectangle object
- items = items.getChild("QQmlApplicationEngine")
+ items = items.getChild("QQuickView")
if items == None:
- earlyExit("Could not find expected QQmlApplicationEngine tree inside Locals and Expressions.")
+ earlyExit("Could not find expected QQuickView tree inside Locals and Expressions.")
+ return
+ items = items.getChild("QQuickRootItem")
+ if items == None:
+ earlyExit("Could not find expected QQuickRootItem tree inside Locals and Expressions.")
return
items = items.getChild("Rectangle")
if items == None:
@@ -72,14 +76,13 @@ def main():
invokeMenuItem("File", "Exit")
def __unfoldTree__():
- view = waitForObject(':Locals and Expressions_Debugger::Internal::WatchTreeView')
# TODO inspect the qmlengine as well?
- rootIndex = getQModelIndexStr("text='QQmlApplicationEngine'",
+ rootIndex = getQModelIndexStr("text='QQuickView'",
':Locals and Expressions_Debugger::Internal::WatchTreeView')
- if not test.verify(view.isExpanded(waitForObject(rootIndex)),
- "QQmlApplicationEngine should be expanded already."):
- unfoldQModelIndex(rootIndex, False)
- mainRect = getQModelIndexStr("text='Rectangle'", rootIndex)
+ unfoldQModelIndex(rootIndex, False)
+ quickRootItem = getQModelIndexStr("text='QQuickRootItem'", rootIndex)
+ unfoldQModelIndex(quickRootItem, False)
+ mainRect = getQModelIndexStr("text='Rectangle'", quickRootItem)
unfoldQModelIndex(mainRect)
subItems = ["text='Rectangle'", "text='Rectangle' occurrence='2'", "text='Text'"]
for item in subItems:
diff --git a/tests/system/suite_editors/tst_clean_whitespaces/test.py b/tests/system/suite_editors/tst_clean_whitespaces/test.py
index 6dab4720f9e..5c9e7aa6a65 100644
--- a/tests/system/suite_editors/tst_clean_whitespaces/test.py
+++ b/tests/system/suite_editors/tst_clean_whitespaces/test.py
@@ -28,7 +28,7 @@ def main():
baseName = os.path.basename(currentFile)
fileName = os.path.join(directory, baseName)
test.log("Testing file %s" % fileName)
- content = readFile(currentFile)
+ content = stringify(readFile(currentFile))
preparedContent, emptyLine, trailingWS = prepareFileExternal(fileName, content)
isIgnored = isIgnoredFile(baseName, ignoredFiles)
test.verify(preparedContent.find('\t') != -1, "Added at least one tab.")
diff --git a/tests/system/suite_editors/tst_edit_externally/test.py b/tests/system/suite_editors/tst_edit_externally/test.py
index b468b4ebe04..e04ab19670a 100644
--- a/tests/system/suite_editors/tst_edit_externally/test.py
+++ b/tests/system/suite_editors/tst_edit_externally/test.py
@@ -26,7 +26,8 @@ def main():
mBox = ("{text?='The file * has been changed on disk. Do you want to reload it?' "
"type='QMessageBox' unnamed='1' visible='1'}")
popupText = ("
The file %s has been changed on disk. Do you want to reload it?
"
- "
The default behavior can be set in Edit > Preferences > Environment > System.
")
+ "
The default behavior can be set in X > Preferences > Environment > System.
")
+ popupText = popupText.replace("X", "Qt Creator" if platform.system() == "Darwin" else "Edit")
formerContent = None
for i, currentFile in enumerate(files):
@@ -38,7 +39,10 @@ def main():
test.fatal("Could not get the editor for '%s'" % currentFile,
"Skipping this file for now.")
continue
+
contentBefore = readFile(currentFile)
+ if not currentFile.endswith(".bin"):
+ contentBefore = stringify(contentBefore)
if i % 2 == 0:
# modify current file and store content for next modification
formerContent = contentBefore
diff --git a/tests/system/suite_editors/tst_select_all/test.py b/tests/system/suite_editors/tst_select_all/test.py
index bf95250cf77..5a3814aae9d 100644
--- a/tests/system/suite_editors/tst_select_all/test.py
+++ b/tests/system/suite_editors/tst_select_all/test.py
@@ -18,7 +18,7 @@ def main():
return
for currentFile in files:
test.log("Opening file %s" % currentFile)
- size = len(readFile(currentFile))
+ size = len(stringify(readFile(currentFile)))
invokeMenuItem("File", "Open File or Project...")
selectFromFileDialog(currentFile, True)
editor = getEditorForFileSuffix(currentFile)
diff --git a/tests/system/suite_general/tst_default_settings/test.py b/tests/system/suite_general/tst_default_settings/test.py
index f710dd1375a..ce026e98d36 100644
--- a/tests/system/suite_general/tst_default_settings/test.py
+++ b/tests/system/suite_general/tst_default_settings/test.py
@@ -4,6 +4,8 @@
source("../../shared/qtcreator.py")
currentSelectedTreeItem = None
+sectionInProgress = None
+genericDebuggers = []
warningOrError = re.compile('
((Error|Warning).*?)
')
def main():
@@ -28,6 +30,7 @@ def __createMinimumIni__(emptyParent):
iniFile.close()
def __checkKits__():
+ global genericDebuggers
mouseClick(waitForObjectItem(":Options_QListView", "Kits"))
# check compilers
expectedCompilers = __getExpectedCompilers__()
@@ -51,6 +54,8 @@ def __checkKits__():
__iterateTree__(":BuildAndRun_QTreeView", __dbgFunc__, foundDebugger)
test.verify(__compareDebuggers__(foundDebugger, expectedDebuggers),
"Verifying found and expected debuggers are equal.")
+ if not test.compare(len(genericDebuggers), 2, "Verifying generic debugger count."):
+ test.log(str(genericDebuggers))
# check Qt versions
qmakePath = which("qmake")
foundQt = []
@@ -87,14 +92,16 @@ def __processSubItems__(treeObjStr, section, parModelIndexStr, doneItems,
additionalFunc, *additionalParameters)
def __iterateTree__(treeObjStr, additionalFunc, *additionalParameters):
- global currentSelectedTreeItem
+ global currentSelectedTreeItem, sectionInProgress
model = waitForObject(treeObjStr).model()
- # 1st row: Auto-detected, 2nd row: Manual
+ # 1st row: Auto-detected, 2nd row: Manual (Debugger has additional section Generic prepended)
for sect in dumpIndices(model):
+ sectionInProgress = str(sect.text)
doneItems = []
parentModelIndex = "%s container='%s'}" % (objectMap.realName(sect)[:-1], treeObjStr)
__processSubItems__(treeObjStr, sect, parentModelIndex, doneItems,
additionalFunc, *additionalParameters)
+ sectionInProgress = None
def __compFunc__(it, foundComp, foundCompNames):
# skip sub section items (will continue on its children)
@@ -118,9 +125,16 @@ def __compFunc__(it, foundComp, foundCompNames):
foundCompNames.append(it)
def __dbgFunc__(it, foundDbg):
+ global sectionInProgress, genericDebuggers
waitFor("object.exists(':Path.Utils_BaseValidatingLineEdit')", 2000)
pathLineEdit = findObject(":Path.Utils_BaseValidatingLineEdit")
- foundDbg.append(str(pathLineEdit.text))
+ if sectionInProgress == 'Generic':
+ debugger = str(pathLineEdit.text)
+ test.verify(debugger == 'gdb' or debugger == 'lldb',
+ 'Verifying generic debugger is GDB or LLDB.')
+ genericDebuggers.append(debugger)
+ else:
+ foundDbg.append(str(pathLineEdit.text))
def __qtFunc__(it, foundQt, qmakePath):
qtPath = str(waitForObject(":QtSupport__Internal__QtVersionManager.qmake_QLabel").text)
@@ -304,8 +318,8 @@ def __compareCompilers__(foundCompilers, expectedCompilers):
isRegex = ".*?" in key or "[.0-9]+" in key
if (((isRegex and re.match(key, list(currentFound.keys())[0], flags)))
or currentFound.keys() == currentExp.keys()):
- if ((isWin and os.path.abspath(currentFound.values()[0].lower())
- == os.path.abspath(currentExp.values()[0].lower()))
+ if ((isWin and os.path.abspath(list(currentFound.values())[0].lower())
+ == os.path.abspath(list(currentExp.values())[0].lower()))
or currentFound.values() == currentExp.values()):
foundExp = True
break
diff --git a/tests/system/suite_general/tst_remove_kits/test.py b/tests/system/suite_general/tst_remove_kits/test.py
index 567d58508b9..19041c7e04c 100644
--- a/tests/system/suite_general/tst_remove_kits/test.py
+++ b/tests/system/suite_general/tst_remove_kits/test.py
@@ -22,10 +22,9 @@ kitNameTemplate = "Manual.%s"
def __removeKit__(_, kitName):
global kitNameTemplate
- if kitName == Targets.getStringForTarget(Targets.getDefaultKit()):
- # The following kits will be the default kit at that time
- kitNameTemplate += " (default)"
item = kitNameTemplate % kitName.replace(".", "\\.")
+ if kitName == Targets.getStringForTarget(Targets.getDefaultKit()):
+ item += " (default)"
mouseClick(waitForObjectItem(":BuildAndRun_QTreeView", item))
clickButton(waitForObject(":Remove_QPushButton"))
diff --git a/tests/system/suite_general/tst_session_handling/test.py b/tests/system/suite_general/tst_session_handling/test.py
index 1e4b9af0fac..b535145cc91 100644
--- a/tests/system/suite_general/tst_session_handling/test.py
+++ b/tests/system/suite_general/tst_session_handling/test.py
@@ -63,18 +63,18 @@ def prepareTestExamples():
def switchSession(toSession):
test.log("Switching to session '%s'" % toSession)
invokeMenuItem("File", "Sessions", "Manage...")
- sessionView = ("{name='sessionView' type='ProjectExplorer::Internal::SessionView' visible='1' "
+ sessionView = ("{name='sessionView' type='Core::Internal::SessionView' visible='1' "
"window=':Session Manager_ProjectExplorer::Internal::SessionDialog'}")
mouseClick(waitForObjectItem(sessionView, toSession))
clickButton(waitForObject("{name='btOpen' type='QPushButton' visible='1' "
"window=':Session Manager_ProjectExplorer::Internal::SessionDialog'}"))
def createAndSwitchToSession(toSession):
- sessionInputDialog = ("{type='ProjectExplorer::Internal::SessionNameInputDialog' unnamed='1' "
+ sessionInputDialog = ("{type='Core::Internal::SessionNameInputDialog' unnamed='1' "
"visible='1' windowTitle='New Session Name'}")
test.log("Switching to session '%s' after creating it." % toSession)
invokeMenuItem("File", "Sessions", "Manage...")
- clickButton(waitForObject("{name='btCreateNew' text='New' type='QPushButton' visible='1' "
+ clickButton(waitForObject("{name='btCreateNew' type='QPushButton' visible='1' "
"window=':Session Manager_ProjectExplorer::Internal::SessionDialog'}"))
lineEdit = waitForObject("{type='QLineEdit' unnamed='1' visible='1' window=%s}"
% sessionInputDialog)