Merge remote-tracking branch 'origin/8.0'

Change-Id: I37a1f78caf9ae258c6b052efa3be15b3dbcbe164

README.md

@@ -149,6 +149,16 @@ like Qt and LLVM, additionally run
 
     cmake --install . --prefix /path/to/qtcreator_install --component Dependencies
 
+### Performance Analyzer
+
+If you have not installed Qt with the Maintenance Tool, you must
+either set the path to the `perfparser` executable as a value of
+the `PERFPROFILER_PARSER_FILEPATH` environment variable or copy
+the executable to from the Qt Creator installation directory to
+the build directory. That is, copy it from
+`/path/to/qtcreator_install/Tools/QtCreator/libexec/qtcreator/` to
+/path/to/qtcreator_buid/libexec/qtcreator/`.
+
 ## Getting LLVM/Clang for the Clang Code Model
 
 The Clang code model uses `Clangd` and the ClangFormat plugin depends on the

coin/instructions/build.yaml

@@ -148,7 +148,7 @@ instructions:
       equals_value: Windows
 
   - type: UploadArtifact
-    archiveDirectory: "{{.AgentWorkingDir}}"
+    archiveDirectory: "{{.AgentWorkingDir}}/qt-creator/qt-creator_build/build"
     transferType: UploadModuleBuildArtifact
     maxTimeInSeconds: 1800
     maxTimeBetweenOutput: 1800

coin/instructions/test.yaml

@@ -1,5 +1,11 @@
 type: Group
 instructions:
+  - type: InstallBinaryArchive
+    relativeStoragePath: "{{.Env.MODULE_ARTIFACTS_RELATIVE_STORAGE_PATH}}/artifacts.tar.gz"
+    directory: "qt-creator/qt-creator_build/build"
+    maxTimeInSeconds: 1800
+    maxTimeBetweenOutput: 1800
+    userMessageOnFailure: "Failed to unarchive build artifacts, check logs"
   - type: ChangeDirectory
     directory: "{{.AgentWorkingDir}}/qt-creator/qt-creator_build/build"
   - type: ExecuteCommand

coin/module_config.yaml

@@ -66,6 +66,7 @@ make_instructions: &make_instructions
 test_instructions: &test_instructions
   type: Group
   instructions:
+    - !include "{{qt-creator/qt-creator}}/provision.yaml"
     - !include "{{qt-creator/qt-creator}}/test.yaml"
 
 instructions:
@@ -74,6 +75,7 @@ instructions:
     - *make_instructions
 
   Test:
+    - *common_environment
     - *test_instructions
 
   LicenseCheck:

doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2021 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -471,14 +471,23 @@
 
     The Performance Analyzer might fail to record data for the following reasons:
 
-    \list 1
-        \li Perf events may be globally disabled on your system. The
-            preconfigured \l Boot2Qt images come with perf events enabled. For
-            a custom configuration you need to make sure that the file
+    \list
+        \li Perf events may be globally disabled on your system.
+            The preconfigured \l Boot2Qt images come with perf events enabled.
+            For a custom configuration you need to make sure that the file
             \c {/proc/sys/kernel/perf_event_paranoid} contains a value smaller
             than \c {2}. For maximum flexibility in recording traces you can
             set the value to \c {-1}. This allows any user to record any kind
             of trace, even using raw kernel trace points.
+
+            The way to enable Perf events depends on your Linux distribution.
+            On some distributions, you can run the following command with
+            root (or equivalent) privileges:
+
+            \badcode
+            echo -e "kernel.perf_event_paranoid=-1\nkernel.kptr_restrict=0" | sudo tee /etc/sysctl.d/10-perf.conf
+            \endcode
+
         \li The connection between the target device and the host may not be
             fast enough to transfer the data produced by Perf. Try modifying
             the values of the \uicontrol {Stack snapshot size} or
@@ -501,8 +510,21 @@
             drives the sampling from software. After the sampling has failed,
             reboot the device. The kernel may have disabled important parts of
             the performance counters system.
+        \li Perf might not be installed. The way to install it depends on your
+            Linux distribution. For example, you might try the following
+            commands:
+
+            \list
+                \li On Ubuntu 22.04:
+                    \c {sudo apt install linux-tools-$(uname -r)}
+                \li On Debian:
+                    \c {apt install linux-perf}
+            \endlist
     \endlist
 
     Output from the helper program that processes the data is displayed in
     \l{Viewing Output}{General Messages}.
+
+    Some information is displayed in \l {Application Output} even if the
+    Performance Analyzer displays error messages.
 */

doc/qtcreator/src/analyze/creator-clang-static-analyzer.qdoc

@@ -135,7 +135,7 @@
         \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Analyzer >
             \uicontrol {Clang Tools}.
 
-            \image qtcreator-clang-tools-options.png "Clang Tools options tab"
+            \image qtcreator-clang-tools-options.png "Clang Tools preferences"
 
         \li In the \uicontrol Clang-Tidy and \uicontrol Clazy-Standalone fields,
             set the paths to the executables to use.

doc/qtcreator/src/analyze/creator-coco.qdoc

@@ -98,8 +98,8 @@
 
     \section1 Changing Fonts and Colors
 
-    To change the default fonts and colors, select \uicontrol Tools >
-    \uicontrol Options > \uicontrol {Text Editor} > \uicontrol {Font & Colors}.
+    To change the default fonts and colors, select \uicontrol Edit >
+    \uicontrol Preferences > \uicontrol {Text Editor} > \uicontrol {Font & Colors}.
     Create your own color scheme and select new fonts and colors for the
     following results:
 

doc/qtcreator/src/analyze/creator-valgrind-overview.qdoc

@@ -58,7 +58,7 @@
     For more information about analyzing applications for which you do not have
     a project, see \l{Running Valgrind Tools on External Applications}.
 
-    To select options for the Valgrind tools, select \uicontrol Edit >
+    To set preferences for the Valgrind tools, select \uicontrol Edit >
     \uicontrol Preferences > \uicontrol Analyzer. You can override the general
     settings for each project in the \uicontrol {Run Settings} for the project.
 

doc/qtcreator/src/android/androiddev.qdoc

@@ -84,7 +84,7 @@
             \uicontrol Android on Windows and Linux or \uicontrol {\QC} >
             \uicontrol Preferences > \uicontrol Devices > \uicontrol Android on
             \macos.
-            \image qtcreator-options-android-main.png "Android options"
+            \image qtcreator-options-android-main.png "Android preferences"
         \li In the \uicontrol {JDK location} field, set the path to the JDK.
             \QC checks the JDK installation and reports errors.
 
@@ -94,7 +94,7 @@
             \inlineimage icons/online.png
             to open the JDK download web page in the default browser.
 
-            \note We recommended using a 64-bit JDK, because the 32-bit one
+            \note We recommended using a 64-bit JDK because the 32-bit one
             might cause issues with \c cmdline-tools, and some packages might
             not be listed.
         \li In the \uicontrol {Android SDK location} field, set the path to the
@@ -130,7 +130,7 @@
     \section2 Manual Setup
 
     \note We recommend that you use the latest Android SDK Command-Line Tools.
-    Using Android SDK Tools version 25.2.5 or earlier is not supported, because
+    Using Android SDK Tools version 25.2.5 or earlier is not supported because
     they cannot be fully integrated with \QC.
 
     However, if the automatic setup does not meet your needs, you can download

doc/qtcreator/src/android/deploying-android.qdoc

@@ -161,7 +161,7 @@
 
     \section3 Building AABs
 
-    For testing the application locally, use the APK format, because
+    For testing the application locally, use the APK format because
     the package can be uploaded directly to the device and run. For
     distribution to the Google Play store, create an AAB by selecting
     the \uicontrol {Build Android App Bundle (*.aab)} check box.
@@ -185,7 +185,7 @@
     verify that the future versions of your application are actually created by
     you.
 
-    \warning Keep the key pair in a safe place and take back up copies, because
+    \warning Keep the key pair in a safe place and take back up copies because
     you cannot update the application if you lose the key pair.
 
     You can use \QC to generate a keystore and a \e {self-signed} certificate.
@@ -461,6 +461,16 @@
     \li Select \uicontrol Projects > \uicontrol Build >
         \uicontrol {Build Android APK} > \uicontrol {Create Templates}.
 
+    \li Check the path in \uicontrol {Android package source directory}.
+
+        \image qtcreator-android-create-template.png "Create Template dialog"
+
+    \li Select \uicontrol {Copy the Gradle files to Android directory} if you
+        plan to extend the Java part of your Qt application.
+
+    \li Select \uicontrol Finish to copy the template files to the \c android
+        directory and to open the manifest file for editing.
+
     \li In the \uicontrol {Package name} field, enter a valid
         \l{Package Names}{package name} for the application.
         For example, \c {org.example.myapplication}.

doc/qtcreator/src/baremetal/creator-baremetal-dev.qdoc

@@ -61,7 +61,7 @@
     \endlist
 
     The bare metal device type accepts custom GDB commands that you specify in
-    the device options. You can specify the commands to execute when connecting
+    the device preferences. You can specify the commands to execute when connecting
     using a particular debug server provider.
 
     The following debug server providers are supported when using GDB:
@@ -101,7 +101,7 @@
     \l{https://github.com/EmBitz/EBlink}{EBlink} is an ARM Cortex-M debug tool
     that supports squirrel scripting, live variables, and hot-plugging.
 
-    \image qtcreator-baremetal-eblink.png "Bare metal device options for EBlink"
+    \image qtcreator-baremetal-eblink.png "Bare metal device preferences for EBlink"
 
     To specify settings for \EBlink:
 
@@ -138,7 +138,7 @@
     \l{https://www.segger.com/products/debug-probes/j-link/}{J-Link} is a line
     of debug probes by Segger.
 
-    \image qtcreator-baremetal-jlink.png "Bare metal device options for J-Link"
+    \image qtcreator-baremetal-jlink.png "Bare metal device preferences for J-Link"
 
     To specify settings for J-Link debug probes:
 
@@ -170,7 +170,7 @@
     (JTAG) facility. It enables source level debugging with the GDB compiled
     for the ARM architecture.
 
-    \image qtcreator-baremetal-openocd.png "Bare metal device options for OpenOCD"
+    \image qtcreator-baremetal-openocd.png "Bare metal device preferences for OpenOCD"
 
     To specify settings for \OpenOCD:
 
@@ -196,7 +196,7 @@
     \l{https://www.st.com/en/development-tools/stm32-programmers.html#products}
     {ST-LINK Utility} is used for programming STM32 microcontrollers.
 
-    \image qtcreator-baremetal-stlink.png "Bare metal device options for St-Link"
+    \image qtcreator-baremetal-stlink.png "Bare metal device preferences for St-Link"
 
     To specify settings for St-Link:
 
@@ -234,7 +234,7 @@
 
     \section3 uVision Simulator
 
-    \image qtcreator-baremetal-uvision-simulator.png "Bare metal device options for uVision Simulator"
+    \image qtcreator-baremetal-uvision-simulator.png "Bare metal device preferences for uVision Simulator"
 
     To specify settings for uVision Simulator or uVision St-Link Debugger:
 
@@ -251,7 +251,7 @@
 
     \section3 uVision St-Link Debugger
 
-    \image qtcreator-baremetal-uvision-st-link.png "Bare metal device options for uVision St-Link"
+    \image qtcreator-baremetal-uvision-st-link.png "Bare metal device preferences for uVision St-Link"
 
     To specify settings for uVision St-Link Debugger:
 
@@ -268,7 +268,7 @@
 
     \section1 Adding Bare Metal Devices
 
-    \image qtcreator-baremetal-devices.png "Bare Metal device options"
+    \image qtcreator-baremetal-devices.png "Bare Metal device preferences"
 
     To add a bare metal device:
 
@@ -291,7 +291,7 @@
     devices, select \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits
     > \uicontrol Add. For more information, see \l{Adding Kits}.
 
-    \image qtcreator-baremetal-kit.png "Kit options for Bare Metal"
+    \image qtcreator-baremetal-kit.png "Kit preferences for Bare Metal"
 
     You can build applications for and run them on bare metal devices
     in the same way as for and on the desktop. For more information, see

doc/qtcreator/src/debugger/creator-only/creator-debugger-settings.qdocinc

@@ -33,7 +33,7 @@
      > \uicontrol Preferences > \uicontrol Debugger. In the \uicontrol General tab,
      you can specify settings that are common to all debuggers.
 
-    \image qtcreator-debugger-general-options.png
+    \image qtcreator-debugger-general-options.png "Debugger General preferences"
 
     You can customize the appearance and behavior of the debug views,
     \l{Specifying Breakpoint Settings}{specify settings for breakpoints},
@@ -74,7 +74,7 @@
     To specify settings for managing the GDB process, select \uicontrol Edit >
     \uicontrol Preferences > \uicontrol Debugger > \uicontrol GDB.
 
-    \image qtcreator-gdb-options.png "GDB options"
+    \image qtcreator-gdb-options.png "GDB preferences"
 
     To specify a timeout for terminating non-responsive GDB processes, set the
     number of seconds to wait in the \uicontrol {GDB timeout} field. The default
@@ -140,7 +140,7 @@
     Enabling them may negatively impact your debugging experience, so use
     them with care.
 
-    \image qtcreator-gdb-extended-options.png "GDB Extended options"
+    \image qtcreator-gdb-extended-options.png "GDB Extended preferences"
 
     To use asynchronous mode to control the inferior, select the
     respective check box.
@@ -165,7 +165,7 @@
     To specify settings for managing the CDB process, select \uicontrol Edit >
     \uicontrol Preferences > \uicontrol Debugger > \uicontrol CDB.
 
-    \image qtcreator-cdb-options.png "CDB options"
+    \image qtcreator-cdb-options.png "CDB preferences"
 
     You can specify additional arguments for starting CDB in the
     \uicontrol {Additional arguments} field.

doc/qtcreator/src/debugger/creator-only/creator-debugger-setup.qdoc

@@ -42,7 +42,7 @@
     specify the debugger and compiler to use for each kit, select
     \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits.
 
-    You need to set up the debugger only if the automatic setup fails, because
+    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

doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc

@@ -110,8 +110,9 @@
     \QC checks whether the compiled program is up-to-date, and rebuilds and
     deploys it if the \uicontrol {Build before deploying} field is set to
     build the whole project or the application to run and the
-    \uicontrol {Always deploy before running} check box is selected in the
-    \uicontrol {Build and Run} options. To debug the program without deploying
+    \uicontrol {Always deploy before running} check box is selected in
+    \uicontrol Edit > \uicontrol Preferences > \uicontrol {Build & Run} >
+    \uicontrol General. To debug the program without deploying
     it, select \uicontrol Debug > \uicontrol {Start Debugging} >
     \uicontrol {Start Debugging Without Deployment}.
 
@@ -674,7 +675,7 @@
     the bottom of the view. Output is displayed in the right pane of the
     \uicontrol {Debugger Log} view.
 
-    \note Usually, you do not need this feature, because \QC provides you
+    \note Usually, you do not need this feature because \QC provides you
     with better ways to handle the task. For example, instead of using the GDB
     \c print command from the command line, you can evaluate an expression in
     the \uicontrol {Expressions} view.
@@ -900,7 +901,7 @@
     \uicontrol Debugger > \uicontrol {Locals & Expressions}, and enter the
     commands in the \uicontrol {Debugging Helper Customization} field.
 
-    \image qtcreator-debugging-helper-options.png
+    \image qtcreator-debugging-helper-options.png "Locals & Expressions preferences"
 
     If you receive error messages about receiving signals when using GDB, you
     can specify \l{https://sourceware.org/gdb/onlinedocs/gdb/Signals.html}
@@ -1564,7 +1565,7 @@
     \l{http://wiki.ubuntu.com/SecurityTeam/Roadmap/KernelHardening#ptrace%20Protection}
     {KernelHardening}.
 
-    However, the usefulness of this security measure seems dubious, because this
+    However, the usefulness of this security measure seems dubious because this
     feature can be easily disabled. With root permissions, you can disable the
     feature temporarily by writing \c{0} into
     \c{/proc/sys/kernel/yama/ptrace_scope} or permanently by changing the value