diff options
| author | Leena Miettinen <riitta-leena.miettinen@qt.io> | 2023-02-03 11:32:25 +0100 |
|---|---|---|
| committer | Leena Miettinen <riitta-leena.miettinen@qt.io> | 2023-02-03 15:06:17 +0000 |
| commit | ce0f48e0f9b9e59c2c876da1eb923622730df6e4 (patch) | |
| tree | aa7cebd94b3a39aa9625538454e30f5dcee34584 /doc/qtcreator/src | |
| parent | e771560ec75d55962d4fbc39f6051b1d71f07bcc (diff) | |
Doc: Replace "contain" with "have" to simplify language
This follows the ComplexWords rule in vale.
Change-Id: Ie5dbb7ac1eff1546dcfbe2bf5da6cc3ed18b7a20
Reviewed-by: Andreas Eliasson <andreas.eliasson@qt.io>
Diffstat (limited to 'doc/qtcreator/src')
71 files changed, 192 insertions, 193 deletions
diff --git a/doc/qtcreator/src/analyze/creator-ctf-visualizer.qdoc b/doc/qtcreator/src/analyze/creator-ctf-visualizer.qdoc index bbdfa7c87e..01de0c237d 100644 --- a/doc/qtcreator/src/analyze/creator-ctf-visualizer.qdoc +++ b/doc/qtcreator/src/analyze/creator-ctf-visualizer.qdoc @@ -212,7 +212,7 @@ \li Count memory page allocations \endlist - To generate JSON files that contain the trace data in Chrome Trace Format, + To generate JSON files that have the trace data in Chrome Trace Format, enter the following command on the command line: \code diff --git a/doc/qtcreator/src/analyze/creator-heob.qdoc b/doc/qtcreator/src/analyze/creator-heob.qdoc index f18f2f60e1..26594ac7d0 100644 --- a/doc/qtcreator/src/analyze/creator-heob.qdoc +++ b/doc/qtcreator/src/analyze/creator-heob.qdoc @@ -156,7 +156,7 @@ the reachable blocks in the results file. Select \uicontrol {Fuzzy Detect Leak Types} to mark memory blocks - \e reachable or \e {indirectly lost} if they contain references to any + \e reachable or \e {indirectly lost} if they have references to any address. This option is useful when used with some custom allocators (such as \c av_malloc() in \c ffmpeg) that keep only an address somewhere inside the allocation block and do not refer directly to the start of an allocated diff --git a/doc/qtcreator/src/analyze/creator-valgrind.qdoc b/doc/qtcreator/src/analyze/creator-valgrind.qdoc index 9c6564cc85..f905cb1766 100644 --- a/doc/qtcreator/src/analyze/creator-valgrind.qdoc +++ b/doc/qtcreator/src/analyze/creator-valgrind.qdoc @@ -83,7 +83,7 @@ To specify global settings for Valgrind, select \uicontrol Edit > \uicontrol Preferences > \uicontrol Analyzer. The \uicontrol - {Memcheck Memory Analysis Options} group contains Memcheck options. + {Memcheck Memory Analysis Options} group has Memcheck options. In \uicontrol {Extra Memcheck arguments}, specify additional arguments for launching the executable. @@ -127,7 +127,7 @@ at startup. A default suppression file is created by the ./configure script when the system is built. - You can write your own suppression files if parts of your project contain + You can write your own suppression files if parts of your project have errors you cannot fix and you do not want to be reminded of them. Click \uicontrol Add in the \uicontrol {MemCheck Memory Analysis} dialog to add the suppression files. @@ -270,7 +270,7 @@ To specify global settings for Valgrind, select \uicontrol Edit > \uicontrol Preferences > \uicontrol Analyzer. The \uicontrol - {Callgrind Profiling Options} group contains Callgrind options. + {Callgrind Profiling Options} group has Callgrind options. \image qtcreator-valgrind-callgrind-options.png "Valgrind options" diff --git a/doc/qtcreator/src/android/androiddev.qdoc b/doc/qtcreator/src/android/androiddev.qdoc index 4474d04c71..b24e077594 100644 --- a/doc/qtcreator/src/android/androiddev.qdoc +++ b/doc/qtcreator/src/android/androiddev.qdoc @@ -17,10 +17,10 @@ To develop for Android, you must have a tool chain for building applications for Android devices installed on the development PC. \QC can automatically download and install the tool chain and create a suitable build and run - \l{glossary-buildandrun-kit}{kit} that contains the tool chain and the Qt + \l{glossary-buildandrun-kit}{kit} that has the tool chain and the Qt version for Android for the device's architecture. - Starting from Qt 5.14.0, the Qt for Android package contains all the + Starting from Qt 5.14.0, the Qt for Android package has all the architectures (ABIs) installed as one. To enable helpful code editing features for Java, such as code completion, diff --git a/doc/qtcreator/src/android/deploying-android.qdoc b/doc/qtcreator/src/android/deploying-android.qdoc index 87a79e21bd..48e83da112 100644 --- a/doc/qtcreator/src/android/deploying-android.qdoc +++ b/doc/qtcreator/src/android/deploying-android.qdoc @@ -16,7 +16,7 @@ \l{Qt for Android} has binaries for armv7a, arm64-v8a, x86, and x86-64. To support several different ABIs in your application, build an AAB that - contains binaries for each of the ABIs. The Google Play store uses the + has binaries for each of the ABIs. The Google Play store uses the AAB to generate optimized APK packages for the devices issuing the download request and automatically signs them with your publisher key. @@ -166,19 +166,19 @@ You can use \QC to generate a keystore and a \e {self-signed} certificate. The generated certificate has the structure of an X.509 v3 digital - certificate. It contains information about the version, serial number, and + certificate. It has information about the version, serial number, and validity period of the certificate, the ID of the algorithm that is used to encrypt the data, the organization that issued the certificate, and the \e subject (owner) of the certificate. In case of a self-signed certificate, the issuer and owner of the certificate are the same. In addition, the - certificate contains information about the algorithm that is used to sign + certificate has information about the algorithm that is used to sign the certificate, as well as the signature of the certificate. The keystore is protected by a password. In addition, you can protect each alias with its individual password. When you sign an Android application, you must select a keystore that - contains certificates and a certificate alias from the keystore. The public + has certificates and a certificate alias from the keystore. The public key (certificate) for the alias is embedded into the APK during signing. To create a keystore and a self-signed certificate: @@ -186,7 +186,7 @@ \list 1 \li In the \uicontrol Keystore field, select \uicontrol Create to create - a new keystore that contains one key pair in the + a new keystore that has one key pair in the \uicontrol {Create a Keystore and a Certificate} dialog: \image qtcreator-android-certificate.png @@ -221,7 +221,7 @@ keystore. \li In the \uicontrol {Certificate alias} field, select an alias from the list - of key pairs that the keystore contains. + of key pairs that the keystore has. \li Select the \uicontrol {Sign package} check box to use the alias to sign the Android package. diff --git a/doc/qtcreator/src/baremetal/creator-baremetal-dev.qdoc b/doc/qtcreator/src/baremetal/creator-baremetal-dev.qdoc index 0f928c6ec8..559f34693b 100644 --- a/doc/qtcreator/src/baremetal/creator-baremetal-dev.qdoc +++ b/doc/qtcreator/src/baremetal/creator-baremetal-dev.qdoc @@ -157,7 +157,7 @@ \include creator-baremetal-settings.qdocinc baremetal-common \li In the \uicontrol {Root scripts directory} field, enter the - path to the directory that contains configuration scripts. + path to the directory that has configuration scripts. \li In the \uicontrol {Configuration file} field, enter the path to the device configuration file. diff --git a/doc/qtcreator/src/cmake/creator-projects-cmake-building.qdoc b/doc/qtcreator/src/cmake/creator-projects-cmake-building.qdoc index b3195cfd21..ac746926e3 100644 --- a/doc/qtcreator/src/cmake/creator-projects-cmake-building.qdoc +++ b/doc/qtcreator/src/cmake/creator-projects-cmake-building.qdoc @@ -55,8 +55,8 @@ \section1 CMake Presets You can use CMake presets files to specify common configure, build, and test - options and share them with others. \c CMakePresets.json contains options for - project-wide builds, whereas \c CMakeUserPresets.json contains options for + options and share them with others. \c CMakePresets.json has options for + project-wide builds, whereas \c CMakeUserPresets.json has options for your local builds. Create the presets files in the format described in @@ -72,7 +72,7 @@ disabled all kits in the project. To update changes to the \c CMakePresets.json file, delete the \c CMakeLists.txt.user file. - \image qtcreator-cmake-presets-configure.webp "Opening a project that contains Cmake presets" + \image qtcreator-cmake-presets-configure.webp "Opening a project that has Cmake presets" You can view the presets in the \uicontrol {Initial Configuration} field and in the environment configuration field below it. diff --git a/doc/qtcreator/src/debugger/creator-debugger-common.qdocinc b/doc/qtcreator/src/debugger/creator-debugger-common.qdocinc index ed4d4bf64a..d295676cfc 100644 --- a/doc/qtcreator/src/debugger/creator-debugger-common.qdocinc +++ b/doc/qtcreator/src/debugger/creator-debugger-common.qdocinc @@ -205,7 +205,7 @@ \li Right-click the breakpoint marker in the text editor and select \uicontrol{Disable Breakpoint}. - \li Select a line that contains a breakpoint and press \key Ctrl+F9 + \li Select a line that has a breakpoint and press \key Ctrl+F9 (\key Ctrl+F8 on \macos). \li In the \uicontrol {Breakpoint Preset} view or the @@ -371,7 +371,7 @@ \li The debug information provided by GCC does not include enough information about the time when a variable is initialized. Therefore, \QC can not tell whether the contents of a local - variable contains "real data", or "initial noise". If a QObject + variable are \e {real data} or \e {initial noise}. If a QObject appears uninitialized, its value is reported as \uicontrol {not in scope}. Not all uninitialized objects, however, can be recognized as such. diff --git a/doc/qtcreator/src/debugger/creator-only/creator-debugger-setup.qdoc b/doc/qtcreator/src/debugger/creator-only/creator-debugger-setup.qdoc index 7e61aa9ddb..ec607e0f29 100644 --- a/doc/qtcreator/src/debugger/creator-only/creator-debugger-setup.qdoc +++ b/doc/qtcreator/src/debugger/creator-only/creator-debugger-setup.qdoc @@ -23,9 +23,9 @@ You need to set up the debugger only if the automatic setup fails because the native debugger is missing (as is usually the case for the CDB debugger on Windows, which you always must install yourself) or because the installed - version is not supported (for example, when your system contains no, or an - outdated version of GDB and you want to use a locally installed replacement - instead). + version is not supported. For example, when your system does not have GDB + installed or the installed version is outdated, and you want to use a locally + installed replacement instead. \note If you need to change the debugger to use for an automatically detected \l{glossary-buildandrun-kit}{kit}, you can \uicontrol Clone the @@ -194,7 +194,7 @@ \section2 Debugging Tools for \macos - The Qt binary distribution contains both debug and release + The Qt binary distribution has both debug and release variants of the libraries. But you have to explicitly tell the runtime linker that you want to use the debug libraries even if your application is compiled as debug, as release is the default diff --git a/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc b/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc index 44d9c9af44..74ffd9c09a 100644 --- a/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc +++ b/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc @@ -295,7 +295,7 @@ \li In the \uicontrol {Core file} field, specify the core file to inspect. \li In the \uicontrol {Executable of symbol file} field, specify - a file that contains debug information corresponding to the + a file that has debug information corresponding to the core file. Typically, this is the executable file or a \c {.debug} file if the debug information is stored separately from the executable. @@ -305,7 +305,7 @@ the \c sysroot to use instead of the default \c sysroot. \endlist - Also in this mode, using a properly configured project containing the + Also in this mode, using a properly configured project that has the sources of the crashed program is not strictly necessary, but helpful. \section2 Launching in Post-Mortem Mode @@ -430,7 +430,7 @@ \list 1 \li Install the \e{Debugging Tools for Windows} on the remote machine. - The installation folder contains the CDB command line executable + The installation folder has the CDB command line executable (\c cdb.exe). \li Copy the \QC CDB extension library and the dependencies from the Qt installation @@ -610,7 +610,7 @@ \li To continue running the program, press \key F5. - \li To run to the line containing the cursor, press \key {Ctrl+F10} + \li To run to the line that has the cursor, press \key {Ctrl+F10} (\key {Shift+F8} on \macos). \li To run to the selected function when you are stepping into a nested @@ -700,7 +700,7 @@ \section2 Stepping into Frameworks in \macos In \macos, external libraries are usually built into so-called Frameworks, - which may contain both release and debug versions of the library. When you + which may have both release and debug versions of the library. When you run applications on the \macos desktop, the release version of Frameworks is used by default. To step into Frameworks, select the \uicontrol {Use debug versions of Frameworks} option in the project run @@ -723,7 +723,7 @@ In addition, the view displays symbols within the modules and indicates where each module was loaded. - Right-click the view to open a context menu that contains menu items for: + Right-click the view to open a context menu that has menu items for: \list @@ -756,7 +756,7 @@ the source file is actually part of the project, or whether it was compiled elsewhere. The view shows the path to each file in the file system. - Right-click the view to open a context menu that contains menu items for + Right-click the view to open a context menu that has menu items for reloading data and opening files. To enable the debugger to step into the code and display the source code @@ -802,7 +802,7 @@ \omit \section2 Creating Snapshots - A snapshot contains the complete state of the debugged program at a time, + A snapshot has the complete state of the debugged program at a time, including the full memory contents. To create snapshots of a debugged program, select \uicontrol {Create Snapshot} @@ -934,7 +934,7 @@ \QC application package, where it is located in the \c Contents/resources/debugger folder. - The \c personaltypes.py file contains one example implementation: + The \c personaltypes.py file has one example implementation: \quotefromfile ../../../share/qtcreator/debugger/personaltypes.py \skipto qdump__ @@ -997,7 +997,7 @@ \list - \li \c d of type \c Dumper, an object containing the current settings and + \li \c d of type \c Dumper, an object that has the current settings and providing facilities to build up an object representing a part of the \uicontrol Locals and \uicontrol Expressions views. @@ -1112,7 +1112,7 @@ \section3 Dumper Class - The \c Dumper class contains generic bookkeeping, low-level, and convenience + The \c Dumper class has generic bookkeeping, low-level, and convenience functions: \list @@ -1476,7 +1476,7 @@ inferior stopped because it received a signal from the operating system. Signal name:? signal meaning: Unknown signal.} - Some versions of Avira AntiVir Desktop-Products contain known issues in + Some versions of Avira AntiVir Desktop-Products have known issues in various development environments, including \QC. To fix the problem, Avira instructs you to update to version \c {avipbb.sys 10.0.22.22}. For more information, see @@ -1489,7 +1489,7 @@ \section1 Debugger Does Not Hit Breakpoints - You might have created a release build that does not contain debug + You might have created a release build that does not have debug information. A GNU Compiler Collection (GCC) debug build has the \c {-g} option on the compiler command line. Check that this option is present in the \l {Compile Output}. If it is not, adjust your build @@ -1570,7 +1570,7 @@ \section2 Disabling Incremental Linking - Incremental linking can affect debugging. If the debugger log contains + Incremental linking can affect debugging. If the debugger log has the \e {Unable to verify checksum of module} message, disable incremental linking. diff --git a/doc/qtcreator/src/editors/creator-clangformat.qdocinc b/doc/qtcreator/src/editors/creator-clangformat.qdocinc index 6674a615fd..335f4f03de 100644 --- a/doc/qtcreator/src/editors/creator-clangformat.qdocinc +++ b/doc/qtcreator/src/editors/creator-clangformat.qdocinc @@ -18,11 +18,11 @@ {Beautifier} because combining them can provide unexpected results. You can use Clang Format to enforce a coding style for a project or the - whole organization. Create a \c {.clang-format} file that contains the + whole organization. Create a \c {.clang-format} file that has the \l{https://clang.llvm.org/docs/ClangFormatStyleOptions.html} {Clang Format Style Options} to use and save it in the root folder of the project or one of its parent folders. The plugin searches for the Clang - format file recursively from the directory that contains the source file + format file recursively from the directory that has the source file up to the file system root. To override the \c {.clang-format} file globally for all projects, select @@ -49,7 +49,7 @@ \uicontrol {ClangFormat} > \uicontrol {Override Clang Format configuration file}. - You can create \c {.clang-format} files that contain the configuration + You can create \c {.clang-format} files that have the configuration options of a certain predefined style from the command line. For example, to create a format file for the LLVM style, enter the following command: diff --git a/doc/qtcreator/src/editors/creator-code-completion.qdoc b/doc/qtcreator/src/editors/creator-code-completion.qdoc index 414e436744..772432f910 100644 --- a/doc/qtcreator/src/editors/creator-code-completion.qdoc +++ b/doc/qtcreator/src/editors/creator-code-completion.qdoc @@ -170,7 +170,7 @@ \list - \li Text snippets, which can contain any text string. For example, code + \li Text snippets, which can have any text string. For example, code comments \if defined(qtcreator) diff --git a/doc/qtcreator/src/editors/creator-code-indentation.qdoc b/doc/qtcreator/src/editors/creator-code-indentation.qdoc index f00ecdc4f1..49ee67a22a 100644 --- a/doc/qtcreator/src/editors/creator-code-indentation.qdoc +++ b/doc/qtcreator/src/editors/creator-code-indentation.qdoc @@ -167,7 +167,7 @@ \section1 Indenting Other Text Files - To specify indentation settings for text files that do not contain C++ or + To specify indentation settings for text files that do not have C++ or QML code (such as Python code files), select \uicontrol Edit > \uicontrol Preferences > \uicontrol {Text Editor} > \uicontrol Behavior. @@ -238,7 +238,7 @@ the cursor is located within leading white space, select \uicontrol {In Leading White Space}. - Your highlight definition file can contain definitions for both multi and + Your highlight definition file can have definitions for both multi and single line comments. To apply the single line comment definition when commenting out a selection, select \uicontrol {Prefer single line comments}. diff --git a/doc/qtcreator/src/editors/creator-code-syntax.qdoc b/doc/qtcreator/src/editors/creator-code-syntax.qdoc index f4f57e6488..deb2e3b7d9 100644 --- a/doc/qtcreator/src/editors/creator-code-syntax.qdoc +++ b/doc/qtcreator/src/editors/creator-code-syntax.qdoc @@ -28,7 +28,7 @@ \image qtcreator-semanticerror.png - In the following screenshot, a Qt class name contains a typo: + In the following screenshot, a Qt class name has a typo: \image qtcreator-typo-clang.png @@ -46,7 +46,7 @@ In addition to underlining, errors and warnings are marked with icons and annotated. \endif - When writing QML or JavaScript code, the annotations may contain error codes + When writing QML or JavaScript code, the annotations may have error codes listed in \l{JavaScript and QML Error Codes}. \image qml-syntax-check.png diff --git a/doc/qtcreator/src/editors/creator-coding-edit-mode.qdoc b/doc/qtcreator/src/editors/creator-coding-edit-mode.qdoc index 10283d1c66..86ec3c0ec6 100644 --- a/doc/qtcreator/src/editors/creator-coding-edit-mode.qdoc +++ b/doc/qtcreator/src/editors/creator-coding-edit-mode.qdoc @@ -48,7 +48,7 @@ \uicontrol Window > \uicontrol {Go to Last Edit}. To go to any open file, select it from the \uicontrol {Open files} drop-down - menu (1). To open a context menu that contains commands for managing open + menu (1). To open a context menu that has commands for managing open files, right-click the file name or icon on the toolbar. In addition to the commands also available in the \uicontrol File menu, you can copy the path and name of the current file and the number of the line where the cursor is @@ -120,7 +120,7 @@ \section1 Editing Selected Lines - The \uicontrol Edit > \uicontrol Advanced menu contains options for editing + The \uicontrol Edit > \uicontrol Advanced menu has options for editing selected lines of text. To duplicate the selected lines, select \uicontrol {Duplicate Selection}. diff --git a/doc/qtcreator/src/editors/creator-editors-writing-code.qdoc b/doc/qtcreator/src/editors/creator-editors-writing-code.qdoc index ef7a2bf5e2..7b88c1aaf1 100644 --- a/doc/qtcreator/src/editors/creator-editors-writing-code.qdoc +++ b/doc/qtcreator/src/editors/creator-editors-writing-code.qdoc @@ -50,7 +50,7 @@ \li \l{Indenting Text or Code} \QC indents text and code according to rules that you - specify separately for files that contain C++, QML, or + specify separately for files that have C++, QML, or Nim (experimental) code and for other text files. \li \l{Using Qt Quick Toolbars} 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 d01eb5455e..d74678152f 100644 --- a/doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc +++ b/doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc @@ -52,7 +52,7 @@ error markers is the same as a compiler will give you, not an incomplete set or a close approximation, as when using the built-in \QC code model. Clang focuses on detailed information for diagnostics, which is really - useful if the code contains typos, for example. + useful if the code has typos, for example. We make use of these libraries via the clangd tool, which implements an \l{https://microsoft.github.io/language-server-protocol/}{LSP} server. @@ -141,7 +141,7 @@ \QC. By default, \QC runs one clangd process per project. If you have created - \l{Managing Sessions}{sessions} that contain related projects, you can + \l{Managing Sessions}{sessions} that have related projects, you can specify that the projects in the session should be managed by a single clangd process. 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 fed160bf76..dd38af1e38 100644 --- a/doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc +++ b/doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc @@ -170,7 +170,7 @@ \section1 Inspecting Language Clients \QC sends messages (\e Requests) to the language server and receives - responses that contain the requested information if the language server is + responses that have the requested information if the language server is capable of handling the requests. To inspect the communication between \QC and language servers and view server capabilities, select \uicontrol Tools > \uicontrol {Debug \QC} > \uicontrol {Inspect Language Clients}. diff --git a/doc/qtcreator/src/editors/creator-only/creator-mime-types.qdoc b/doc/qtcreator/src/editors/creator-only/creator-mime-types.qdoc index b2532c6e03..7436a9c32a 100644 --- a/doc/qtcreator/src/editors/creator-only/creator-mime-types.qdoc +++ b/doc/qtcreator/src/editors/creator-only/creator-mime-types.qdoc @@ -26,7 +26,7 @@ matches the patterns specified for any MIME type. If no match is found, it checks the contents of the file for magic headers specified for the file. - The magic headers can contain the following types of values: string, host, + The magic headers can have the following types of values: string, host, big-endian, little-endian, and byte. \QC interprets the values according to the \l{http://standards.freedesktop.org/shared-mime-info-spec/shared-mime-info-spec-latest.html} @@ -92,7 +92,7 @@ delete the pattern \c {*.dts} from the MIME type \c {audio/vnd.dts} (where it represents the digital surround audio file format), and add it to the \c {text/plain} MIME type. You can use the \uicontrol Filter field to find - the MIME type that currently contains a filename extension. + the MIME type that currently has a filename extension. To revert the changes you have made to the MIME type definitions, select \uicontrol {Reset MIME Types}. To revert the changes you have diff --git a/doc/qtcreator/src/editors/creator-only/creator-modeling.qdoc b/doc/qtcreator/src/editors/creator-only/creator-modeling.qdoc index 181a4e1e0d..0f828a7cff 100644 --- a/doc/qtcreator/src/editors/creator-only/creator-modeling.qdoc +++ b/doc/qtcreator/src/editors/creator-only/creator-modeling.qdoc @@ -52,7 +52,7 @@ \section1 Using the Model Editor - You can create models that contain several different structural or + You can create models that have several different structural or behavioral diagrams. You can add elements to the diagrams and specify properties for them. You can either use standard model elements or add your own elements with custom diff --git a/doc/qtcreator/src/editors/creator-only/creator-scxml.qdoc b/doc/qtcreator/src/editors/creator-only/creator-scxml.qdoc index d4aae2879b..bc20206ea2 100644 --- a/doc/qtcreator/src/editors/creator-only/creator-scxml.qdoc +++ b/doc/qtcreator/src/editors/creator-only/creator-scxml.qdoc @@ -129,7 +129,7 @@ \li \e Initial state is the state the state machine enters when it starts. - \li \e {Parallel state} contains child states that execute in parallel + \li \e {Parallel state} has child states that execute in parallel and are all active simultaneously. Events are processed independently by each child state and may trigger different transitions for each child. diff --git a/doc/qtcreator/src/editors/creator-quick-fixes.qdoc b/doc/qtcreator/src/editors/creator-quick-fixes.qdoc index 0dee251e3a..57bb973bb2 100644 --- a/doc/qtcreator/src/editors/creator-quick-fixes.qdoc +++ b/doc/qtcreator/src/editors/creator-quick-fixes.qdoc @@ -25,7 +25,7 @@ In the context menu, select \uicontrol {Refactoring} and then select a refactoring action. - You can also press \key {Alt+Enter} to open a context menu that contains + You can also press \key {Alt+Enter} to open a context menu that has refactoring actions available in the current cursor position. \if defined(qtcreator) @@ -187,7 +187,7 @@ \li Activation \row \li Add Curly Braces - \li Adds curly braces to an if statement that does not contain a + \li Adds curly braces to an if statement that does not have a compound statement. For example, rewrites \code @@ -608,7 +608,7 @@ selection are rewritten. \li Declarations with pointers or references and selections - containing such declarations + that have such declarations \row \li Create Getter and Setter Member Functions \li Creates either both getter and setter member functions for diff --git a/doc/qtcreator/src/editors/creator-search.qdoc b/doc/qtcreator/src/editors/creator-search.qdoc index 741bdf9906..13dc963896 100644 --- a/doc/qtcreator/src/editors/creator-search.qdoc +++ b/doc/qtcreator/src/editors/creator-search.qdoc @@ -178,8 +178,7 @@ \image qtcreator-searchresults.png - A list of files containing the searched text is displayed in - \l {Search Results}. + \l {Search Results} shows a list of files that have the searched text. \list diff --git a/doc/qtcreator/src/howto/creator-external-tools.qdoc b/doc/qtcreator/src/howto/creator-external-tools.qdoc index c8f7da91d6..dee3f838ab 100644 --- a/doc/qtcreator/src/howto/creator-external-tools.qdoc +++ b/doc/qtcreator/src/howto/creator-external-tools.qdoc @@ -125,7 +125,7 @@ the tool in the system environment or the \l{Build Environment} {build environment} or \l {Selecting the Run Environment} {run environment} of the active project. Select the build or run - environment if the system environment does not contain the necessary + environment if the system environment does not have the necessary PATH settings to find the tool chain, for example. \else \li In the \uicontrol {Base environment} field, use the default settings. diff --git a/doc/qtcreator/src/howto/creator-help.qdoc b/doc/qtcreator/src/howto/creator-help.qdoc index b6208c34c6..7bdea9afac 100644 --- a/doc/qtcreator/src/howto/creator-help.qdoc +++ b/doc/qtcreator/src/howto/creator-help.qdoc @@ -76,7 +76,7 @@ \section1 Finding Information in Qt Documentation - \QC, \QSDK and other Qt deliverables contain documentation + \QC, \QSDK and other Qt deliverables have documentation as .qch files. All the documentation is accessible in the \uicontrol Help mode. By default, \QC registers only the latest available version of the @@ -135,9 +135,9 @@ In the \uicontrol Search pane, you can use full-text search for finding a particular word in all the installed documents. Enter the term you are looking for, and select the \uicontrol Search button. All documents that - contain the specified term are listed. The list is sorted by document + have the specified term are listed. The list is sorted by document version (if you have installed several Qt versions, for example) and - the number of search hits that the documents contain. Select a document in + the number of search hits that the documents have. Select a document in the list to open it. \image qtcreator-help-search.png "Search pane" @@ -146,16 +146,16 @@ \list - \li \c deep lists all the documents that contain the word \c deep. + \li \c deep lists all the documents that have the word \c deep. The search is not case sensitive. - \li \c{deep*} lists all the documents that contain a word beginning + \li \c{deep*} lists all the documents that have a word beginning with \c deep - \li \c{deep copy} lists all documents that contain both \c deep and + \li \c{deep copy} lists all documents that have both \c deep and \c copy - \li \c{"deep copy"} lists all documents that contain the phrase + \li \c{"deep copy"} lists all documents that have the phrase \c{deep copy} \endlist @@ -169,7 +169,7 @@ \inlineimage icons/reload_gray.png (\uicontrol {Regenerate Index}). - Punctuation is not included in indexed terms. To find terms that contain + Punctuation is not included in indexed terms. To find terms that have punctuation, such as domain names, use the asterisk as a wild card. For example, to find \c {Pastebin.Com}, enter the search term \c {Pastebin*}. diff --git a/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc b/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc index cdbd4c21e9..5731f9bcca 100644 --- a/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc +++ b/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc @@ -97,7 +97,7 @@ \list \li To import a keyboard shortcut mapping scheme, click \uicontrol Import - and select the .kms file containing the keyboard shortcut mapping scheme + 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 diff --git a/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc b/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc index 346e7a0000..b6778a95de 100644 --- a/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc +++ b/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc @@ -52,7 +52,7 @@ \section1 Creating Tests - You can use a wizard to create projects that contain tests. + You can use a wizard to create projects that have tests. \section2 Creating Qt and Qt Quick Tests @@ -137,7 +137,7 @@ support C++ 11 features in the test. \li In the \uicontrol {Google test repository} field, select - a directory that contains a clone of the googletest + a directory that has a clone of the googletest repository. To use an installed Google C++ Testing framework instead, @@ -182,9 +182,9 @@ \li In the \uicontrol {Test case name} field, enter a name for the test case. \li In the \uicontrol {Boost include dir (optional)} field, - enter the path to the directory that contains files needed + enter the path to the directory that has files needed by Boost.Test, such as \e version.hpp and a subfolder called - \e test that contains the test header files. + \e test that has the test header files. \li In the \uicontrol {Build system} field, select the build system to use for building the project: qmake, CMake, or Qbs. @@ -224,7 +224,7 @@ to use a self defined main function and set up the project to use Qt features. \li In the \uicontrol {Catch2 include directory (optional)} field, - you may enter a path to the directory that contains the + you may enter a path to the directory that has the Catch2 header files. \li In the \uicontrol {Build system} field, select the build system to use for building the project: qmake, CMake, or @@ -306,7 +306,7 @@ \list 1 - \li Open a project that contains tests. + \li Open a project that has tests. \li In the \uicontrol Tests view, select the tests to run. 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 f16d707411..ea72d61d54 100644 --- a/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc +++ b/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc @@ -257,13 +257,13 @@ \section1 Add a license header template for C++ code - Specify a file containing a license header for C++ in \uicontrol Edit > + Specify a file that has a license header for C++ in \uicontrol Edit > \uicontrol Preferences > \uicontrol C++ > \uicontrol {File Naming} > \uicontrol {License template}. \image qtcreator-options-cpp-files.png "File Naming preferences" - The license file may contain special placeholders enclosed + The license file may have special placeholders enclosed in \c{%%} that are replaced when generating a new file: \list 1 diff --git a/doc/qtcreator/src/howto/creator-only/creator-task-lists.qdoc b/doc/qtcreator/src/howto/creator-only/creator-task-lists.qdoc index 4153857004..4cc7ecda41 100644 --- a/doc/qtcreator/src/howto/creator-only/creator-task-lists.qdoc +++ b/doc/qtcreator/src/howto/creator-only/creator-task-lists.qdoc @@ -29,7 +29,7 @@ To open task list files in \uicontrol Issues, choose \uicontrol File > \uicontrol Open. Right-click a task list entry to open a context menu that - contains commands for managing the entry. You can copy or remove task list + has commands for managing the entry. You can copy or remove task list entries or navigate to the corresponding source code. \QC monitors the loaded files and displays the changes in \uicontrol Issues. diff --git a/doc/qtcreator/src/howto/creator-only/qtcreator-faq.qdoc b/doc/qtcreator/src/howto/creator-only/qtcreator-faq.qdoc index 18e62c88ef..13b813abb6 100644 --- a/doc/qtcreator/src/howto/creator-only/qtcreator-faq.qdoc +++ b/doc/qtcreator/src/howto/creator-only/qtcreator-faq.qdoc @@ -8,7 +8,7 @@ \title FAQ - This section contains answers to some frequently asked questions about \QC. + This section has answers to some frequently asked questions about \QC. You might also find answers to your questions in the \l{Known Issues} and \l{How-tos} sections, or the Troubleshooting sections for a special area, such as @@ -146,7 +146,7 @@ \QC comes fully integrated with Qt documentation and examples using the Qt Help plugin. The integrated Qt Reference Documentation is available - for Qt 4.4 and later. \QC and other Qt deliverables contain + for Qt 4.4 and later. \QC and other Qt deliverables have documentation as .qch files. All the documentation is accessible in the \uicontrol Help mode. diff --git a/doc/qtcreator/src/incredibuild/creator-projects-incredibuild-building.qdoc b/doc/qtcreator/src/incredibuild/creator-projects-incredibuild-building.qdoc index a619a764b3..d87cadf88c 100644 --- a/doc/qtcreator/src/incredibuild/creator-projects-incredibuild-building.qdoc +++ b/doc/qtcreator/src/incredibuild/creator-projects-incredibuild-building.qdoc @@ -82,7 +82,7 @@ \li \uicontrol {Save IncrediBuild monitor file} writes a copy of the build progress (\c{.ib_mon}) file to the specified location. If only a folder name is given, IncrediBuild generates a GUID for - the file name. A message containing the location of the saved + the file name. A message that has the location of the saved \c{.ib_mon} file is added to the end of the build output. \li \uicontrol {Suppress STDOUT} does not write anything to the standard output. diff --git a/doc/qtcreator/src/linux-mobile/creator-embedded-platforms.qdoc b/doc/qtcreator/src/linux-mobile/creator-embedded-platforms.qdoc index cbca285cf6..cd6a7bd944 100644 --- a/doc/qtcreator/src/linux-mobile/creator-embedded-platforms.qdoc +++ b/doc/qtcreator/src/linux-mobile/creator-embedded-platforms.qdoc @@ -46,7 +46,7 @@ Either Windows 10 64-bit or later or Ubuntu Linux 64-bit 20.04 LTS or later is required to install and use Boot2Qt. - The following topics contain more information about developing applications + The following topics have more information about developing applications for Boot2Qt devices: \list @@ -66,7 +66,7 @@ You must have a tool chain for building applications for embedded Linux devices installed on the development PC. - The following topics contain more information about developing applications + The following topics have more information about developing applications for remote Linux devices: \list @@ -84,7 +84,7 @@ necessary for bare metal software development on devices based on the Arm Cortex-M processors. - The following topics contain more information about developing applications + The following topics have more information about developing applications for MCUs: \list @@ -100,7 +100,7 @@ \note In Qt 6, \QC support for QNX is considered experimental. - The following topics contain more information about developing applications + The following topics have more information about developing applications for QNX devices: \list diff --git a/doc/qtcreator/src/overview/creator-only/creator-configuring.qdoc b/doc/qtcreator/src/overview/creator-only/creator-configuring.qdoc index 4429f3283b..1158c037e2 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-configuring.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-configuring.qdoc @@ -167,7 +167,7 @@ \section2 Installing Plugins - Qt Marketplace contains links to \QC plugins that you can download and + Qt Marketplace has links to \QC plugins that you can download and install either for free or for a price set by their publisher. You can browse the available plugins in the \uicontrol Marketplace tab in the Welcome mode. @@ -180,7 +180,7 @@ \li Select \uicontrol Help > \uicontrol {About Plugins} > \uicontrol {Install Plugins}. \li In the \uicontrol Source dialog, enter the path to the archive - or library that contains the plugin. + or library that has the plugin. \image qtcreator-install-plugin-source.png \li In the \uicontrol {Install Location} dialog, select \uicontrol {User plugins} to make the plugin available for the diff --git a/doc/qtcreator/src/overview/creator-only/creator-design-overview.qdoc b/doc/qtcreator/src/overview/creator-only/creator-design-overview.qdoc index 76307ccea4..fff838b030 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-design-overview.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-design-overview.qdoc @@ -27,7 +27,7 @@ \li \l{Developing Qt Quick Applications} - You can use wizards to create Qt Quick projects containing + You can use wizards to create Qt Quick projects that have boiler-plate code that you can edit in the \uicontrol Edit mode. \li \l{Developing Widget Based Applications} diff --git a/doc/qtcreator/src/overview/creator-only/creator-glossary.qdoc b/doc/qtcreator/src/overview/creator-only/creator-glossary.qdoc index 43959315b4..c9c3d16bf1 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-glossary.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-glossary.qdoc @@ -22,12 +22,12 @@ \row \li Build configuration \target glossary-build-config - \li Contains all the information you need to compile the sources + \li Has all the information you need to compile the sources into binaries. Different build configurations allow you to quickly build the project for different purposes. By default, \QC creates \e {debug build} and \e {release build} configurations for each \e {kit} defined for your project. - A debug build contains + A debug build has additional debug symbols that you need for debugging the application but that you can leave out from the release version. Generally, you use the debug configuration for testing and the @@ -48,10 +48,10 @@ \li Component \target glossary-component \li An instantiable QML definition, typically - contained in a .qml file. For instance, a Button component may - be defined in Button.qml. The QML runtime may instantiate this - Button component to create Button objects. Alternatively, a - component may be defined inside a \l{Component} QML type. + in a .qml file. For instance, you can define a Button component + in Button.qml. The QML runtime may instantiate this + Button component to create Button objects. Alternatively, you may + define a component in a \l{Component} QML type. \row \li Deploy configuration 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 74d4860f3c..a5df9187a4 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-help-overview.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-help-overview.qdoc @@ -28,7 +28,7 @@ \li \l{FAQ} - Contains answers to some frequently asked questions about \QC. + Has answers to some frequently asked questions about \QC. \li \l{How-tos} diff --git a/doc/qtcreator/src/overview/creator-only/creator-issues.qdoc b/doc/qtcreator/src/overview/creator-only/creator-issues.qdoc index b1989c86eb..9a09a24b09 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-issues.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-issues.qdoc @@ -74,7 +74,7 @@ \list - \li Paths or file names containing spaces or special characters + \li Paths or file names that have spaces or special characters (such as colons, dollar signs, and hash marks) may cause problems. This is because some of the tools \QC uses in the background have restrictions on the characters allowed in file and directory names. @@ -82,7 +82,7 @@ items with names consisting of plain characters, numbers, underscores, and hyphens. - \li If error messages displayed in \l {Compile Output} contain + \li If error messages displayed in \l {Compile Output} have paths where slashes are missing (for example, C:QtSDK), check your PATH variable. For more information, see \l{Troubleshooting MinGW Compilation Errors}. @@ -113,7 +113,7 @@ using the \c {--bind mount} option. \li Setting breakpoints in files will fail when using LLDB if the file path - contains symbolic links. + has symbolic links. \li A regression in GCC 4.5.0 causes return value optimization to produce inaccurate debug info that GCC applies also to diff --git a/doc/qtcreator/src/overview/creator-only/creator-mobile-platforms.qdoc b/doc/qtcreator/src/overview/creator-only/creator-mobile-platforms.qdoc index 7af06ba9ff..c6d689547b 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-mobile-platforms.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-mobile-platforms.qdoc @@ -27,11 +27,11 @@ \section1 Android - Starting from Qt 5.14.0, the Qt for Android package contains all the + Starting from Qt 5.14.0, the Qt for Android package has all the architectures (ABIs) installed as one. You can let \QC automatically create kits for installed Qt version and tool chains. - The following topics contain more information about developing applications + The following topics have more information about developing applications for Android devices: \list @@ -50,7 +50,7 @@ iOS. \QC automatically detects the tool chain and creates the necessary kits to build applications for and run them on configured iOS devices. - The following topics contain more information about developing applications + The following topics have more information about developing applications for iOS devices: \list diff --git a/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc b/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc index 3bd6c9e5c4..6588673371 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc @@ -35,7 +35,7 @@ information as a compiler would need. It stores the information in the project settings. - \QC contains templates for creating new projects. They guide + \QC has templates for creating new projects. They guide you step-by-step through the project creation process, create the necessary files, and specify settings depending on the choices you make. For more information, see diff --git a/doc/qtcreator/src/overview/creator-only/mobile-app-design.qdoc b/doc/qtcreator/src/overview/creator-only/mobile-app-design.qdoc index 22393b98d6..3026f35dcc 100644 --- a/doc/qtcreator/src/overview/creator-only/mobile-app-design.qdoc +++ b/doc/qtcreator/src/overview/creator-only/mobile-app-design.qdoc @@ -64,7 +64,7 @@ \li Design for limited input methods Applications collect information from users on the task at hand. In - addition to touch screen input, some devices contain physical keys + addition to touch screen input, some devices have physical keys such as a five way navigation pad, a keypad, and a keyboard. Users enter information by using screen controls, such as lists, check boxes, radio buttons, and text fields. diff --git a/doc/qtcreator/src/projects/creator-only/creator-files-creating.qdoc b/doc/qtcreator/src/projects/creator-only/creator-files-creating.qdoc index 3a7fd55ee7..6444a07b9d 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-files-creating.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-files-creating.qdoc @@ -31,7 +31,7 @@ \row \li {1,3} Modeling \li State Chart - \li State Chart XML (SCXML) file that contains boilerplate + \li State Chart XML (SCXML) file that has boilerplate code for state machines. You can use the classes in the \l {Qt SCXML} module to embed state machines created from the files in Qt applications. diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-building-running.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-building-running.qdoc index 7af185b151..700e08bd8d 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-building-running.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-building-running.qdoc @@ -33,7 +33,7 @@ \li \l{Building for Multiple Platforms} - \e {Build configurations} contain everything you need to compile + \e {Build configurations} have everything you need to compile the sources into binaries. Build configurations use the tools and settings defined in their corresponding kit. diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-building.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-building.qdoc index 77805ea2aa..d67f493dd1 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-building.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-building.qdoc @@ -57,7 +57,7 @@ \section1 Additional Build Commands - The \uicontrol Build menu contains additional commands for building, + The \uicontrol Build menu has additional commands for building, rebuilding, and cleaning projects. To build the current project in all its configurations, that diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc index 8cfb298d21..a4ec2eabec 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc @@ -95,32 +95,32 @@ \li Uses a single main.cpp file. \row \li Qt Quick Application - \li Creates a Qt Quick 2 application project that can contain both + \li Creates a Qt Quick 2 application project that can have both QML and C++ code. You can build the application and deploy it to desktop, embedded, and mobile target platforms. \row \li {1,4} Application (Qt for Python) \li Empty Application \li Creates a \l{https://doc.qt.io/qtforpython/index.html} - {Qt for Python} application that contains only the main + {Qt for Python} application that has only the main code for a QApplication. \row \li Empty Window - \li Creates a Qt for Python application that contains an empty + \li Creates a Qt for Python application that has an empty window. \row \li Window UI - \li Creates a Qt for Python application that contains an empty + \li Creates a Qt for Python application that has an empty window with a widget-based UI. Preferred approach that requires you to generate a Python file from the .ui file, to import it directly into your application. \row \li Window UI - Dynamic load - \li Creates a Qt for Python application that contains an empty + \li Creates a Qt for Python application that has an empty window with a widget-based UI. \row \li Qt Quick Application - Empty - \li Creates a Python project that contains an empty Qt Quick + \li Creates a Python project that has an empty Qt Quick Application. \row \li {1,3} Library @@ -141,10 +141,10 @@ \row \li Qt Quick UI Prototype \li Creates a \l{Creating Qt Quick UI Projects}{Qt Quick UI project} - with a single QML file that contains the main view. You can + with a single QML file that has the main view. You can preview Qt Quick 2 UI projects in the \l{Validating with Target Hardware}{QML Scene preview tool}. - You do not need to build them because they do not contain any + You do not need to build them because they do not have any C++ code. Use this template only if you are prototyping. You cannot create @@ -168,7 +168,7 @@ \row \li Code Snippet \li Creates a qmake project from a code snippet. When working on - bug reports that contain a code snippet, you can place the code + bug reports that have a code snippet, you can place the code snippet into a project to compile and check it. \row \li {1,4} Non-Qt Project @@ -230,7 +230,7 @@ \section1 Specifying Project Contents - A project can contain files that should be: + A project can have files that should be: \list \li Compiled or otherwise handled by the build diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards-json.qdocinc b/doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards-json.qdocinc index 8a31b460c0..f54122ce52 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards-json.qdocinc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards-json.qdocinc @@ -62,7 +62,7 @@ \section1 Creating Wizards - \QC contains wizards for adding classes, files, and projects. You can + \QC has wizards for adding classes, files, and projects. You can use them as basis for adding your own wizards. We use the C++ wizard to explain the process and the sections and settings in the .json file. @@ -222,7 +222,7 @@ \endlist - \li The \c options section contains an array of objects with \e key + \li The \c options section has an array of objects with \e key and \e value attributes. You can define your own variables to use in the configuration and template source files, in addition to the predefined variables. For example, the C++ class creation @@ -302,7 +302,7 @@ \li \c data specifies the wizard pages. In the C++ wizard, it specifies a \c Fields page and a \c Summary page. The - \c Fields page contains the \c CheckBox, \c ComboBox, + \c Fields page has the \c CheckBox, \c ComboBox, \c LineEdit, \c PathChooser, and \c Spacer widgets. For more information about the widgets, see \l{Available Widgets}. @@ -364,10 +364,10 @@ \li \c Features lists all features available via any of the kits configured in \QC. - \li \c Plugins contains a list of all plugins running in the current + \li \c Plugins has a list of all plugins running in the current instance of \QC. - \li \c Platform contains the platform selected in the \uicontrol File > + \li \c Platform has the platform selected in the \uicontrol File > \uicontrol {New Project} or \uicontrol {New File} dialog. This value may be empty. \endlist @@ -378,7 +378,7 @@ \list \li \c InitialPath with the path to the selected node. - \li \c ProjectExplorer.Profile.Ids contains a list of Kits configured + \li \c ProjectExplorer.Profile.Ids has a list of Kits configured for the project of the selected node. \endlist @@ -389,7 +389,7 @@ \section2 Field Page - A Field page has the \c typeId value \c Field and contains widgets. For more + A Field page has the \c typeId value \c Field and has widgets. For more information about widget definitions, see \l{Available Widgets}. \code @@ -451,7 +451,7 @@ \section2 Kits A Kits page has the \c typeId value \c Kits. The \c data section of a Kits - page contains an object with the following settings: + page has an object with the following settings: \list \li \c projectFilePath with the path to the project file. @@ -493,7 +493,7 @@ \section2 Project - A Project page has the \c typeId value \c Project. It contains no data or an + A Project page has the \c typeId value \c Project. It has no data or an object with the \c trDescription property which will be shown on the generated page. \c trDescription defaults to \c {%\{trDescription\}}, which is filled in with the information taken from the \c trDescription @@ -513,7 +513,7 @@ \section2 Summary - A Summary page has the \c typeId value \c Summary. It contains no data or + A Summary page has the \c typeId value \c Summary. It has no data or an empty object. \code @@ -722,9 +722,9 @@ \list \li \c items specifies a list of items to put into the list type. The - list can contain both JSON objects and plain strings. + list can have both JSON objects and plain strings. For JSON objects, define \c trKey and \c value pairs, where the - \c trKey is the list item visible to users and \c value contains + \c trKey is the list item visible to users and \c value has the data associated with the item. In addition, you can use \c icon to specify an icon for the list item and \c trToolTip to specify a tooltip for it. @@ -758,7 +758,7 @@ \li \c wordWrap is set to \c true to enable word wrap. By default, it is set to \c{false}. - \li \c trText contains the label text to display. + \li \c trText has the label text to display. \endlist @@ -811,7 +811,7 @@ case. \li \c isPassword is a boolean value that specifies that the line edit - contains a password, which will be masked. + has a password, which will be masked. \li \c historyId is a key that specifies the name for a list of items for the history completer. This value and \c completion are @@ -908,7 +908,7 @@ \list \li \c source specifies the path and filename of the template file - relative to the directory containing the \c {wizard.json} file. + relative to the directory that has the \c {wizard.json} file. If \c source is unset, it is assumed that the file with the name given in \c target is generated by some other means. This is useful diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards.qdoc index b6f786f1ad..f2dae9f9ce 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards.qdoc @@ -19,9 +19,9 @@ files. You can create custom wizards in JSON format. They are stored in wizard - template directories that contain a JSON configuration file called + template directories that have a JSON configuration file called \c {wizard.json} and any template files needed. The configuration file - contains sections that specify information about the wizard, variables + has sections that specify information about the wizard, variables that you can use, wizard pages, and generators for creating files. To create a customized wizard, copy a template directory to the shared @@ -49,7 +49,7 @@ You can add wizard pages to allow developers to specify settings for the project. - A file wizard is similar, but does not contain any project file. + A file wizard is similar, but does not have any project file. \section1 Locating Wizards @@ -130,7 +130,7 @@ \c wizard.json file. If it does not find the file, it does not show the message. - If the file contains errors, such as an invalid icon path, you receive the + If the file has errors, such as an invalid icon path, you receive the following types of messages: \code diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-generic.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-generic.qdoc index 8acb985d3c..f447ef82e0 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-generic.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-generic.qdoc @@ -121,7 +121,7 @@ \section1 Forwarding Flags to Clang Code Model - The \c {.cxxflags} and \c {.cflags} files contain command line flags for the + The \c {.cxxflags} and \c {.cflags} files have command line flags for the Clang code model on a single line. For example, specify the \c {-std=c++11} to set the language version diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-libraries.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-libraries.qdoc index f48b8fe649..c63cf151d1 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-libraries.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-libraries.qdoc @@ -48,7 +48,7 @@ The default convention on Windows is that the debug and release versions of a library have the same name, but are placed in different subdirectories, - usually called \e debug and \e release. If the library path does not contain + usually called \e debug and \e release. If the library path does not have either of these folders, you cannot select the option to place the libraries in separate folders. diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build.qdoc index 368024f4ef..91ffcfe81d 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build.qdoc @@ -16,7 +16,7 @@ Different build configurations allow you to quickly switch between different build settings. By default, \QC creates \e debug, \e release, and - \e profile build configurations. A debug build contains additional + \e profile build configurations. A debug build has additional debug symbols that you need for debugging the application but that you can leave out from the release version. Generally, you use the debug configuration for testing and the release configuration for creating @@ -91,7 +91,7 @@ \uicontrol {Default arguments}, \uicontrol {Extra arguments}, \uicontrol {Make arguments}, or \uicontrol {Tool arguments}. You can create shell command lines - that can contain redirection and other advanced constructs. However, some + that can have redirection and other advanced constructs. However, some more complex use cases, such as piping test data into the application being tested or grouping commands, are not supported because the value of the \uicontrol Executable field is always placed first when constructing the command. diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-sharing.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-sharing.qdoc index 382b18aaec..ee57314918 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-sharing.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-sharing.qdoc @@ -16,7 +16,7 @@ \QC stores user-specific project settings in a \e {.user} file. You can share these settings between several projects as a \e {.shared} file. It - has the same XML structure as a \e {.user} file, but only contains the + has the same XML structure as a \e {.user} file, but only has the settings to share. \section1 Creating Shared Settings File diff --git a/doc/qtcreator/src/projects/creator-projects-running.qdoc b/doc/qtcreator/src/projects/creator-projects-running.qdoc index 874d9e346e..2393c4d2bb 100644 --- a/doc/qtcreator/src/projects/creator-projects-running.qdoc +++ b/doc/qtcreator/src/projects/creator-projects-running.qdoc @@ -61,7 +61,7 @@ useful when developing Qt Quick applications because the QML files are interpreted at runtime. Therefore, the application does not need to be built again if you edited only QML files. This saves time especially if - the application contains large image files that would need to be bundled + the application has large image files that would need to be bundled into the resource file before running the application. \image qtcreator-application-output.png diff --git a/doc/qtcreator/src/projects/qtcreator-variables.qdocinc b/doc/qtcreator/src/projects/qtcreator-variables.qdocinc index bfb90b4943..eef3870698 100644 --- a/doc/qtcreator/src/projects/qtcreator-variables.qdocinc +++ b/doc/qtcreator/src/projects/qtcreator-variables.qdocinc @@ -34,7 +34,7 @@ %{variable//pattern/replacement} \endcode - The pattern can be a regular expression and the replacement can contain + The pattern can be a regular expression and the replacement can have backreferences. For example, if \c %{variable} is \c my123var, then \c %{variable/(..)(\d+)/\2\1} is expanded to \c {123myvar}. diff --git a/doc/qtcreator/src/python/creator-python-project.qdocinc b/doc/qtcreator/src/python/creator-python-project.qdocinc index 4d32d5abff..5c5fcc2eb3 100644 --- a/doc/qtcreator/src/python/creator-python-project.qdocinc +++ b/doc/qtcreator/src/python/creator-python-project.qdocinc @@ -27,10 +27,10 @@ can set the interpreter to use by default. The Qt for Python Application wizards generate a \c {.pyproject} file that - lists the files in the Python project and a \c {.py} file that contains + lists the files in the Python project and a \c {.py} file that has some boilerplate code. In addition, the widget-based UI wizard creates a - \c {.ui} file that contains a \QD form, and the Qt Quick Application wizard - creates a \c {.qml} file that contains Qt Quick controls. + \c {.ui} file that has a \QD form, and the Qt Quick Application wizard + creates a \c {.qml} file that has Qt Quick controls. The \c{.pyproject} files are JSON-based configuration files that replace the previously used \c {.pyqtc} configuration files. You can still open and @@ -38,7 +38,7 @@ for new projects. The \uicontrol {Window UI} wizard enables you to - create a Python project that contains the source file for a class. Specify + create a Python project that has the source file for a class. Specify the PySide version, class name, base class, and and source file for the class. @@ -147,7 +147,7 @@ \section1 Creating Qt Quick Based Python Applications The \uicontrol {Qt for Python - Qt Quick Application - Empty} wizard enables - you to create a Python project that contains a main QML file. Specify the + you to create a Python project that has a main QML file. Specify the minimum PySide version to run the application. \image qtcreator-python-wizard-qml.png "Qt for Python wizard for creating an empty Qt Quick application" 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 23e5cfb68d..7ca4ea2a01 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 @@ -163,7 +163,7 @@ update the CMake configuration with the following Qt module information: \c Sensors, \c Svg, \c Xml. - The \e CMakeLists.txt file should contain the following entries that tell + The \e CMakeLists.txt file should have the following entries that tell CMake to look up the Qt installation and import the Qt Sensors, Qt SVG, and Qt XML modules needed by the application: diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-app-development.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-app-development.qdoc index 6e5e351f3c..44fa152758 100644 --- a/doc/qtcreator/src/qtquick/creator-only/qtquick-app-development.qdoc +++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-app-development.qdoc @@ -48,7 +48,7 @@ Qt Quick UI projects (.qmlproject) are useful for creating user interfaces. To use them for application development, you have to - convert them to Qt Quick Application projects that contain .pro, + convert them to Qt Quick Application projects that have .pro, .cpp, and .qrc files. \li \l {UI Files} 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 bda9e67875..06396ceb5c 100644 --- a/doc/qtcreator/src/qtquick/creator-only/qtquick-app-tutorial.qdoc +++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-app-tutorial.qdoc @@ -66,7 +66,7 @@ \li Select \uicontrol Finish to create \e Page.qml. \endlist - \QC opens \e Page.qml in the \uicontrol Edit mode. It contains a root item + \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 type the ID \e page, anchor it to the parent item on all sides, and set its color to white: diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc index 4516d30afb..f10e1b7afb 100644 --- a/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc +++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc @@ -27,21 +27,21 @@ \row \li Application (Qt) \li Qt Quick Application - \li Creates a Qt Quick 2 application project that can contain both + \li Creates a Qt Quick 2 application project that can have both QML and C++ code. You can build the application and deploy it to desktop, embedded, and mobile target platforms. \row \li Application (Qt for Python) \li Qt for Python - Qt Quick Application - \li Creates a Python project that contains an empty Qt Quick + \li Creates a Python project that has an empty Qt Quick Application. \row \li Other Project \li Qt Quick UI Prototype \li Creates a Qt Quick UI project with a single QML file that - contains the main view. You can preview Qt Quick 2 UI projects + has the main view. You can preview Qt Quick 2 UI projects in the QML Scene preview tool. You do not need to build them - because they do not contain any C++ code. + because they do not have any C++ code. This project type is compatible with \QDS. However, use this template only if you are prototyping. You cannot create @@ -146,7 +146,7 @@ Qt Quick UI Prototype projects are useful for testing or prototyping user interfaces, or for setting up a separate project just for QML editing, for example. You - cannot use them for application development because they do not contain: + cannot use them for application development because they do not have: \list \li C++ code diff --git a/doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc b/doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc index 7283673037..7208ad333e 100644 --- a/doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc @@ -59,7 +59,7 @@ The wizard automatically adds the \c QML_IMPORT_PATH option to the project file for specifying the required \l{QML Import Path}{QML import path}. The - path is only needed if more than one subdirectory contains QML files. + path is only needed if more than one subdirectory has QML files. Then you can use the \l QQuickView class in the main C++ source file to show the main QML file when the application starts. diff --git a/doc/qtcreator/src/qtquick/qtquick-modules-with-plugins.qdoc b/doc/qtcreator/src/qtquick/qtquick-modules-with-plugins.qdoc index 34afcc1354..bc583e8465 100644 --- a/doc/qtcreator/src/qtquick/qtquick-modules-with-plugins.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-modules-with-plugins.qdoc @@ -36,7 +36,7 @@ \c {imports\asset_imports}. \li For Qt Quick UI projects (.qmlproject), specify the path to - the directory that contains the module in the .qmlproject file + the directory that has the module in the .qmlproject file of the application where you want to use the module as a value of the \c importPaths variable. For example \c{importPaths: [ "imports", "asset_imports" ]}. @@ -77,7 +77,7 @@ When \l{Defining QML Types from C++}{registering QML types}, make sure that the QML module has a \c{plugins.qmltypes} file. Ideally, it should be located - in the same directory as the \c qmldir file. The \c qmltypes file contains a + in the same directory as the \c qmldir file. The \c qmltypes file has a description of the components exported by the module's plugins and is loaded by \QC when the module is imported. 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 a37467fc30..416e32e02f 100644 --- a/doc/qtcreator/src/user-interface/creator-file-system-view.qdoc +++ b/doc/qtcreator/src/user-interface/creator-file-system-view.qdoc @@ -53,7 +53,7 @@ \li Open a project located in the selected directory. \li Show the file or directory in the file explorer. \li Open a terminal window in the selected directory or in the directory - that contains the file. To specify the terminal to use on Linux and + that has the file. To specify the terminal to use on Linux and \macos, select \uicontrol Edit > \uicontrol Preferences > \uicontrol Environment > \uicontrol System. \li Search from the selected directory. @@ -83,7 +83,7 @@ \image qtcreator-filesystem-view.webp "File System view in the sidebar" \else - The toolbar in the \uicontrol {File System} view contains additional + The toolbar in the \uicontrol {File System} view has additional options. \endif diff --git a/doc/qtcreator/src/user-interface/creator-projects-view.qdoc b/doc/qtcreator/src/user-interface/creator-projects-view.qdoc index 0f5010ae60..4e2577cf7c 100644 --- a/doc/qtcreator/src/user-interface/creator-projects-view.qdoc +++ b/doc/qtcreator/src/user-interface/creator-projects-view.qdoc @@ -13,7 +13,7 @@ \title Projects The \uicontrol Projects view displays projects in a project tree. - The project tree contains a list of all projects open in the current + The project tree has a list of all projects open in the current \l{Managing Sessions}{session}. For each project, the tree visualizes the build system structure of the project and lists all files that are part of the project. @@ -36,7 +36,7 @@ source files open in the code editor. Use the \l{Selecting Modes} {mode selector} to open the current file in another editor. \li To bring up a \l{Projects View Context Menu}{context menu} - containing the actions most commonly needed, right-click an + that has the actions most commonly needed, right-click an item in the project tree. For example, through the menu of the project root directory you can, among other actions, run and close the project. @@ -49,7 +49,7 @@ \section1 Projects View Context Menu - The \uicontrol Projects view contains context menus for managing projects, + The \uicontrol Projects view has context menus for managing projects, subprojects, folders, and files. Use the following functions to manage projects and subprojects: @@ -97,12 +97,12 @@ \if defined(qtdesignstudio) In the \uicontrol Edit and \uicontrol Debug mode, the - \l{Working with Sidebars}{sidebar} contains the \uicontrol Projects + \l{Working with Sidebars}{sidebar} has the \uicontrol Projects view. It has a toolbar with additional options. \image qtcreator-projects-view-edit.png "Projects view in the sidebar" \else - The toolbar in the \uicontrol Projects view contains additional options. + The toolbar in the \uicontrol Projects view has additional options. \endif @@ -117,7 +117,7 @@ \li \uicontrol {Hide Disabled Files} hides the source files that you have not enabled for the current target, \li \uicontrol {Hide Empty Directories} hides directories that do not - contain any files. + have any files. \li \uicontrol {Show Source and Header Groups} shows source and header files grouped together in the view, regardless of their location in the file system. diff --git a/doc/qtcreator/src/user-interface/creator-ui.qdoc b/doc/qtcreator/src/user-interface/creator-ui.qdoc index 7e34962e95..c39513a13c 100644 --- a/doc/qtcreator/src/user-interface/creator-ui.qdoc +++ b/doc/qtcreator/src/user-interface/creator-ui.qdoc @@ -116,7 +116,7 @@ \section1 Customizing the Menu By default, top-level menu items \uicontrol Build, \uicontrol Debug, and - \uicontrol Analyze are not visible. These menu items contain options for + \uicontrol Analyze are not visible. These menu items have options for advanced functionality. To toggle the visibility of these menu items: diff --git a/doc/qtcreator/src/user-interface/creator-views.qdoc b/doc/qtcreator/src/user-interface/creator-views.qdoc index 1a620b807f..789c622f72 100644 --- a/doc/qtcreator/src/user-interface/creator-views.qdoc +++ b/doc/qtcreator/src/user-interface/creator-views.qdoc @@ -60,7 +60,7 @@ The following sections describe the additional options in a particular view. - In some views, right-clicking opens a context menu that contains functions + In some views, right-clicking opens a context menu that has functions for managing the objects listed in the view. \section1 Viewing Defined Types and Symbols diff --git a/doc/qtcreator/src/vcs/creator-only/creator-vcs-fossil.qdoc b/doc/qtcreator/src/vcs/creator-only/creator-vcs-fossil.qdoc index 6148a58076..3b44f802ff 100644 --- a/doc/qtcreator/src/vcs/creator-only/creator-vcs-fossil.qdoc +++ b/doc/qtcreator/src/vcs/creator-only/creator-vcs-fossil.qdoc @@ -10,7 +10,7 @@ Fossil is an open source distributed version control system, designed and developed by the creator of SQLite. A stand-alone Fossil executable - contains a source control management engine, web interface, issue tracker, + has a source control management engine, web interface, issue tracker, wiki, and built-in web server. Fossil is available for Linux, Windows, and \macos. @@ -41,7 +41,7 @@ \section1 Additional Fossil Functions In addition to the standard version control system functions described in - \l {Using Version Control Systems}, the \uicontrol Fossil submenu contains + \l {Using Version Control Systems}, the \uicontrol Fossil submenu has the following items: \table 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 8ba13c140c..52968f5b94 100644 --- a/doc/qtcreator/src/vcs/creator-only/creator-vcs-gitlab.qdoc +++ b/doc/qtcreator/src/vcs/creator-only/creator-vcs-gitlab.qdoc @@ -88,7 +88,7 @@ \QC automatically opens the project. If the cloned project has several project files (such as CMakeList.txt, .pro, and .qbs), \QC prompts you to - select the one to open. If it does not contain a project file that \QC can + select the one to open. If it does not have a project file that \QC can open, select \uicontrol File > \uicontrol {New Project} > \uicontrol {Import Project} > \uicontrol {Import Existing Project} to import the project as a generic project. For more information, see diff --git a/doc/qtcreator/src/vcs/creator-only/creator-vcs-options.qdocinc b/doc/qtcreator/src/vcs/creator-only/creator-vcs-options.qdocinc index 75459cba0b..f1d2818931 100644 --- a/doc/qtcreator/src/vcs/creator-only/creator-vcs-options.qdocinc +++ b/doc/qtcreator/src/vcs/creator-only/creator-vcs-options.qdocinc @@ -21,7 +21,7 @@ field. For some version control systems, you can specify the maximum number of - lines the log can contain in the \uicontrol {Log count} field. + lines the log can have in the \uicontrol {Log count} field. After you set up the version control system, use the command line to check that everything works (for example, use the status command). If no issues diff --git a/doc/qtcreator/src/vcs/creator-only/creator-vcs.qdoc b/doc/qtcreator/src/vcs/creator-only/creator-vcs.qdoc index 3631b4023a..bc685047e3 100644 --- a/doc/qtcreator/src/vcs/creator-only/creator-vcs.qdoc +++ b/doc/qtcreator/src/vcs/creator-only/creator-vcs.qdoc @@ -89,7 +89,7 @@ \section1 Using Common Functions - The \uicontrol{Tools} menu contains a submenu for each supported version + The \uicontrol{Tools} menu has a submenu for each supported version control system. This section describes using the functions that are available for all the supported version control systems. For more information about the additional functions and options available for a @@ -144,15 +144,15 @@ \section2 Viewing Versioning History and Change Details Display the versioning history of a file by selecting \uicontrol{Log} - or \uicontrol{Filelog}. Typically, the log output contains the date, the commit + or \uicontrol{Filelog}. Typically, the log output has the date, commit message, and a change or revision identifier. \section2 Annotating Files - Annotation views are obtained by selecting \uicontrol{Annotate} or \uicontrol{Blame}. - Selecting \uicontrol{Annotate} or \uicontrol{Blame} displays the lines of the file - prepended by the change identifier they originate from. Clicking on the - change identifier shows a detailed description of the change. + To open annotation views, select \uicontrol {Annotate} or \uicontrol {Blame}. + They show the lines of the file and the identifier of the change the lines + originate from. Click the change identifier to see a detailed description of + the change. To show the annotation of a previous version, right-click on the version identifier at the beginning of a line and choose one of the @@ -167,7 +167,7 @@ Once you have finished making changes, submit them to the version control system by choosing \uicontrol{Commit} or \uicontrol{Submit}. \QC displays a - commit page containing a text editor where you can enter your commit + commit page that has a text editor where you can enter your commit message and a checkable list of modified files to include. \section2 Reverting Changes diff --git a/doc/qtcreator/src/vcs/creator-vcs-git.qdoc b/doc/qtcreator/src/vcs/creator-vcs-git.qdoc index 1acf233eb0..0cc5c93637 100644 --- a/doc/qtcreator/src/vcs/creator-vcs-git.qdoc +++ b/doc/qtcreator/src/vcs/creator-vcs-git.qdoc @@ -50,7 +50,7 @@ To work with the current file, select the commands in \uicontrol Tools > \uicontrol Git > \uicontrol {Current File}. Some of the commands are also - available for the project or local repository that contains the file. + available for the project or local repository that has the file. \section2 Viewing Git Diff @@ -72,7 +72,7 @@ \section2 Viewing Git Log To display the versioning history of a file, select \uicontrol{Log of}. - The log output contains the date, the commit message, and a commit + The log output has the date, the commit message, and a commit identifier. Click on the commit identifier to view commit details. \image qtcreator-git-log.png "Commit details in Git log" @@ -187,7 +187,7 @@ \section2 Viewing Git Status To view the status of the repository in \uicontrol {Version Control}, - select \uicontrol Status. The context menu contains additional + select \uicontrol Status. The context menu has additional actions, such as selecting and clearing all entries, copying text, and opening files. @@ -299,7 +299,7 @@ To refresh the list of branches, select \inlineimage icons/reload_gray.png (\uicontrol Refresh). - The context menu for a branch contains the following functions: + The context menu for a branch has the following functions: \table \header @@ -357,7 +357,7 @@ \li Push the committed changes to the selected remote branch. \endtable - The context menu for a remote branch contains the following additional + The context menu for a remote branch has the following additional functions. To open it, select \uicontrol{Remote Branches} or a remote repository. @@ -454,7 +454,7 @@ To start controlling a project directory that is currently not under version control, select \uicontrol Tools > \uicontrol Git > \uicontrol {Create Repository}. \QC creates a new subdirectory named .git - that contains all the necessary repository files. However, Git does not track + that has all the necessary repository files. However, Git does not track anything in the project yet, so you will need to create an initial commit to start tracking the project files. @@ -572,16 +572,16 @@ To start a graphical interface to Git, select \uicontrol Tools > \uicontrol Git > \uicontrol {Git Tools} > \uicontrol {Git Gui}. - \note On \macos, the default Git installation does not contain Git Gui. To + \note On \macos, the default Git installation does not have Git Gui. To use Git Gui, install it separately. To start Git Gui from \QC, select \uicontrol Preferences > \uicontrol {Version Control} > \uicontrol Git, and - set the path to the environment that contains Git Gui in the + set the path to the environment that has Git Gui in the \uicontrol {Prepend to PATH} field. To start the commit viewer for Git, select \uicontrol Tools > \uicontrol Git > \uicontrol {Git Tools} > \uicontrol Gitk. You can also start the tool to view commits in the current document or in the folder that - contains the current document. To specify arguments for running Gitk, select + has the current document. To specify arguments for running Gitk, select \uicontrol Edit > \uicontrol Preferences > \uicontrol {Version Control} > \uicontrol Git. diff --git a/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc b/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc index 56b0cea0bf..fb0dc11b4b 100644 --- a/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc +++ b/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc @@ -94,7 +94,7 @@ \note The project opens in the \uicontrol Edit mode, which hides these instructions. To return to these instructions, open the \uicontrol Help mode. - The TextFinder project now contains the following files: + The TextFinder project now has the following files: \list diff --git a/doc/qtcreator/src/widgets/qtdesigner-overview.qdoc b/doc/qtcreator/src/widgets/qtdesigner-overview.qdoc index 4b48650b59..b19bdede09 100644 --- a/doc/qtcreator/src/widgets/qtdesigner-overview.qdoc +++ b/doc/qtcreator/src/widgets/qtdesigner-overview.qdoc @@ -21,7 +21,7 @@ For more information about \QD, see the \l{Qt Designer Manual}. - Generally, the integrated \QD contains the same functions as the standalone + Generally, the integrated \QD has the same functions as the standalone \QD. The following sections describe the differences. \section1 Code Editor Integration @@ -38,7 +38,7 @@ In standalone \QD, image resources are created using the built-in \uicontrol {Resource Editor}. In \QC, .ui files are usually part of a project, - which may contain several resource files (.qrc). They are created and + which may have several resource files (.qrc). They are created and maintained by using the \QC Resource Editor. The \QD \uicontrol {Resource Editor} is de-activated and the image resources are displayed in the \QD \uicontrol {Resource Browser}. diff --git a/doc/qtcreator/src/widgets/qtdesigner-plugins.qdoc b/doc/qtcreator/src/widgets/qtdesigner-plugins.qdoc index 555de46476..82b64a127c 100644 --- a/doc/qtcreator/src/widgets/qtdesigner-plugins.qdoc +++ b/doc/qtcreator/src/widgets/qtdesigner-plugins.qdoc @@ -53,7 +53,7 @@ On \macos, a GUI application must be built and run from a bundle. A bundle is a directory structure that appears as a single entity when viewed in the - Finder. A bundle for an application typically contains the executable and + Finder. A bundle for an application typically has the executable and all the resources it needs. \QC uses its own set of Qt Libraries located in the bundle, and therefore, |