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

Change-Id: Ief07ead0b4cf513c70bd74d4f5e28e4642edc78e

doc/config/macros.qdocconf

@@ -32,6 +32,7 @@ macro.QDV               = "Qt Design Viewer"
 macro.QL                = "Qt Linguist"
 macro.QMCU              = "Qt for MCUs"
 macro.QMLD              = "Qt Quick Designer"
+macro.QMLLS             = "QML Language Server"
 macro.QQV               = "Qt QML Viewer"
 macro.QSDK              = "Qt"
 macro.QUL               = "Qt Quick Ultralite"

doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc

@@ -62,7 +62,8 @@
 
     \section1 Adding Language Servers
 
-    \QC adds a Python language server by default.
+    \QC adds a \l{Configure Python language servers}{Python language server} by
+    default.
 
     Also, it offers to install language servers for JSON and YAML files
     when you open them in the editor if it can find the
@@ -71,18 +72,22 @@
 
     \image qtcreator-language-server-json.webp {Prompt to install JSON language server}
 
-    Add a Java language server for \l{Connecting Android Devices}
-    {Android development}. For other languages, add generic stdIO language
-    servers.
+    \l{Add a Java language server} for \l{Connecting Android Devices}
+    {Android development}. For other languages,
+    \l{Add generic language servers}{add generic stdIO language servers}.
 
     To add language servers, go to \preferences > \uicontrol {Language Client}
     and select \uicontrol Add.
 
     \image qtcreator-language-client-options-java.png {Java language server preferences}
 
-    To enable a language server, select the check box next to the language
+    To enable a language server, select the checkbox next to the language
     server name and set server preferences.
 
+    To turn on \l{Turn on \QMLLS}{\QMLLS}, go to
+    \preferences > \uicontrol {Qt Quick} > \uicontrol {QML/JS Editing} and
+    select \uicontrol {Enable \QMLLS}.
+
     To remove language servers from the list, select \uicontrol Delete.
 
     \section1 Supported Locator Filters
@@ -218,23 +223,23 @@
 
     \ingroup creator-how-to-lsp
 
-    \title Turn on QML Language Server
+    \title Turn on \QMLLS
 
-    Since Qt 6.4, the QML language server offers code completion and
+    Since Qt 6.4, \QMLLS offers code completion and
     issues warnings for QML. To use it, go to \preferences >
     \uicontrol {Qt Quick} > \uicontrol {QML/JS Editing} and select
-    \uicontrol {Enable QML Language Server}.
+    \uicontrol {Enable \QMLLS}.
 
-    By default, enabling the QML language server will only enable warning messages
+    By default, enabling \QMLLS will only enable warning messages
     and code completion, while advanced features such as renaming and finding usages
     will be handled by the embedded code model.
-    To disable the embedded code model and use the QML language server for everything,
-    select \uicontrol {Use QML Language Server advanced features}.
+    To disable the embedded code model and use \QMLLS for everything,
+    select \uicontrol {Use \QMLLS advanced features}.
 
-    Also, \QC tries to use the QML language server shipped with
-    the Qt version in your current kit. To override that behavior and always use the
-    QML language server of the highest registered Qt version, select
-    \uicontrol {Use QML Language Server from latest Qt version}.
+    Also, \QC tries to use \QMLLS shipped with
+    the Qt version in your current kit. To override that behavior and always use
+    \QMLLS of the highest registered Qt version, select
+    \uicontrol {Use \QMLLS from latest Qt version}.
 
     \image qtcreator-qml-js-editing.webp {QML/JS Editing preferences}
 

doc/qtcreator/src/external-resources/external-resources.qdoc

@@ -1,6 +1,10 @@
 // Copyright (C) 2022 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
+/*!
+    \externalpage https://www.perforce.com/manuals/cmdref/Content/CmdRef/P4CONFIG.html
+    \title Perforce: P4CONFIG
+*/
 /*!
     \externalpage https://doc.qt.io/Boot2Qt/index.html
     \title Boot2Qt: Documentation

doc/qtcreator/src/projects/creator-only/creator-projects-build-run-tutorial.qdoc

@@ -1,4 +1,4 @@
-// Copyright (C) 2021 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 // **********************************************************************
@@ -50,10 +50,17 @@
             the \uicontrol Boot2Qt tag (commercial only) in the search field
             (4) to list examples that you can run on Boot2Qt devices.
 
+        \li In \uicontrol {Configure Project}, select
+            \l{glossary-buildandrun-kit}{kits} for building the example for the
+            target platforms.
+
+            \image qtcreator-configure-project.webp {Configure Project view}
+
+        \li Select \uicontrol {Configure Project}.
+
         \li To check that you can compile and link the application code for a
-            device, click the \uicontrol {Kit Selector} and select a
-            \l{glossary-buildandrun-kit}{kit} for the
-            device.
+            device, click the \uicontrol {Kit Selector} and select the kit for
+            the device.
 
             \image qtcreator-examples-kit-selector.webp {Selecting a kit to build with}
 
@@ -61,7 +68,7 @@
             automatically detected the installed kit. If you cannot see any kits,
             see \l{Add kits}.
 
-        \li Click \inlineimage icons/run_small.png
+        \li Select \inlineimage icons/run_small.png
             (\uicontrol Run) to build and run the application.
 
         \li To see the compilation progress, press \key{Alt+4} to open
@@ -78,7 +85,7 @@
 
     \endlist
 
-    \sa {Add compilers}, {Add kits}, {Add Qt versions},
+    \sa {Manage Kits}{How To: Manage Kits}, {Open projects},
     {Connecting Android Devices}, {Connecting iOS Devices},
     {Compile Output}, {Boot2Qt: Documentation}, {Qt Design Studio Manual}
 */

doc/qtcreator/src/projects/creator-only/creator-projects-opening.qdoc

@@ -63,15 +63,15 @@
     To re-configure projects:
 
     \list 1
-        \li In the \uicontrol {Configure Project} tab, select
+        \li In \uicontrol {Configure Project}, select
             \l{glossary-buildandrun-kit}{kits} for building
             and running your project.
-            \image qtcreator-open-project-kits.png {Configure Project tab}
+            \image qtcreator-configure-project.webp {Configure Project view}
         \li Select \uicontrol {Configure Project}.
     \endlist
 
-    The \uicontrol {Configure Project} tab displays a list of kits that you
-    install on the development PC and configure in \preferences > \uicontrol Kits.
+    \uicontrol {Configure Project} shows a list of kits that you
+    install on the computer and configure in \preferences > \uicontrol Kits.
 
     Even if you do not intend to build the project, the C++ and QML code models
     need a Qt version and compiler to offer code completion. To specify them,

doc/qtcreator/src/vcs/creator-only/creator-vcs-perforce.qdoc

@@ -35,11 +35,26 @@
     Set workspace details in \uicontrol {P4 user}, \uicontrol {P4 client}, and
     \uicontrol {P4 port}.
 
-    To specify the details individually for several projects, use configuration
-    files instead. Create a \c {p4config.txt} configuration file for each
-    project in the top level project directory, and run
-    \c{p4 set P4CONFIG=p4config.txt} once. You must deselect the
-    \uicontrol {Environment Variables} check box.
+    \section1 Using Configuration Files
+
+    To specify workspace details individually for several projects, use
+    configuration files:
+
+    \list 1
+        \li Create a \c {p4config.txt} configuration file for each project in the
+            top level project directory.
+        \li Go to \preferences > \uicontrol {Version Control} >
+            \uicontrol Perforce.
+        \li Clear \uicontrol {Environment Variables}.
+        \li To set \c P4CONFIG to use the file that you created, run the
+            following command from the command line once:
+            \badcode
+            p4 set P4CONFIG=p4config.txt
+            \endcode
+    \endlist
+
+    For more information about using the \c P4CONFIG variable, see
+    \l{Perforce: P4CONFIG}.
 
     \section1 Editing Files