Merge remote-tracking branch 'origin/9.0'

Change-Id: Ie069f3b2a1200b3e665341b1d56ce836024b0d29

cmake/QtCreatorTranslations.cmake

@@ -97,12 +97,23 @@ function(_create_ts_custom_target name)
     DEPENDS ${_sources}
     VERBATIM)
 
-  add_custom_target("${_arg_TS_TARGET_PREFIX}${name}_cleaned"
-    COMMAND Qt5::lupdate -locations relative -no-ui-lines -no-sort -no-obsolete -locations none "@${ts_file_list}" -ts ${ts_files}
-    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
-    COMMENT "Generate .ts files, remove obsolete and vanished translations, and do not add files and line number"
-    DEPENDS ${_sources}
-    VERBATIM)
+  # Add cleaned target only for single-ts targets
+  # Uses lupdate + convert instead of just lupdate with '-locations none -no-obsolete'
+  # to keep the same sorting as the non-'cleaned' target and therefore keep the diff small
+  list(LENGTH ts_files file_count)
+  if(file_count EQUAL 1)
+    # get path for lconvert...
+    get_target_property(_lupdate_binary Qt5::lupdate IMPORTED_LOCATION)
+    get_filename_component(_bin_dir ${_lupdate_binary} DIRECTORY)
+
+    add_custom_target("${_arg_TS_TARGET_PREFIX}${name}_cleaned"
+      COMMAND Qt5::lupdate -locations relative -no-ui-lines -no-sort "@${ts_file_list}" -ts ${ts_files}
+      COMMAND ${_bin_dir}/lconvert -locations none -no-ui-lines -no-obsolete ${ts_files} -o ${ts_files}
+      WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+      COMMENT "Generate .ts files, remove obsolete and vanished translations, and do not add files and line number"
+      DEPENDS ${_sources}
+      VERBATIM)
+  endif()
 endfunction()
 
 function(add_translation_targets file_prefix)

dist/changelog/changes-9.0.0.md

@@ -19,6 +19,8 @@ General
 * Locator `t` filter
     * Added non-menu actions
     * Added fuzzy matching
+* Added `Remove Folder` to `File System` view (QTCREATORBUG-27331)
+* Fixed that clipboard was cleared on shutdown (QTCREATORBUG-28317)
 
 Help
 ----
@@ -53,6 +55,7 @@ Editing
   action (QTCREATORBUG-28099)
 * Fixed that selection was not considered for refactoring actions
   (QTCREATORBUG-27886)
+* Fixed code style preview editor size (QTCREATORBUG-27267)
 * Clangd
     * Added option for using single Clangd instance for the whole session
       (QTCREATORBUG-26526)
@@ -70,17 +73,27 @@ Editing
       session load (QTCREATORBUG-22584)
 * ClangFormat
     * Moved settings back to top level preferences page
+    * Updated formatting options (QTCREATORBUG-28263)
+    * Fixed indentation of comments (QTCREATORBUG-25539)
 
 ### Language Server Protocol
 
 * Improved performance for large documents
 * Fixed that server was not restarted after 5 times, even if a long time passed
   after the last time
 
+### QML
+
+* Fixed that `Follow Symbol` could open file from build directory
+  (QTCREATORBUG-27173)
+* Fixed cursor position and breakpoints after reformatting (QTCREATORBUG-25218,
+  QTCREATORBUG-28349)
+
 ### Image Viewer
 
 * Made `Fit to Screen` sticky and added option for the default
   (QTCREATORBUG-27816)
+* Cleaned up tool bar (QTCREATORBUG-28309)
 
 ### Diff Viewer
 
@@ -94,13 +107,16 @@ Projects
   (QTCREATORBUG-26069)
 * Fixed that opening terminal from build environment settings did not change
   directory to build directory
+* Fixed that local environment was used when inspecting GCC toolchain on remote
+* Fixed stopping terminal process (QTCREATORBUG-28365)
 
 ### CMake
 
 * Moved settings from `Kits` and `Build & Run` into their own `CMake` category
 * Turned `Package manager auto setup` off by default
 * Added support for CMake configure and build presets, including conditions and
   toolchain files (QTCREATORBUG-24555)
+  ([CMake Documentation](https://cmake.org/cmake/help/v3.21/manual/cmake-presets.7.html))
 * Added option for changing environment for configure step
 * Added option for hiding subfolders in source groups (QTCREATORBUG-27432)
 * Added support for `Build File` also from header files (QTCREATORBUG-26164)
@@ -116,6 +132,11 @@ Projects
 
 * Added workaround for `mkspec`s that add compiler flags to `QMAKE_CXX`
   (QTCREATORBUG-28201)
+* Fixed unnecessary updates after project build (QTCREATORBUG-27785)
+
+### Python
+
+* Adapted to move of project tool to `PySide6-Essentials` package
 
 Debugging
 ---------
@@ -124,6 +145,15 @@ Debugging
   devices
 * Fixed display of strings with characters more than 2 bytes long
 * Improved type name lookup performance for heavily templated code
+* Improved display performance for large array-like data (QTCREATORBUG-28111)
+
+Analyzer
+--------
+
+### Clang
+
+* Fixed error when analyzing non-desktop targets (QTCREATORBUG-25615)
+* Fixed wrong failure count display (QTCREATORBUG-27330)
 
 Version Control Systems
 -----------------------
@@ -132,8 +162,10 @@ Version Control Systems
 
 * Added support for user-configured comment character (QTCREATORBUG-28042)
 * Improved matching of commit hashes (QTCREATORBUG-24768, QTCREATORBUG-28268)
-* Fixed adding or deleting files in nested directories (QTCREATORBUG-27644, QTCREATORBUG-27405)
+* Fixed adding or deleting files in nested directories (QTCREATORBUG-27644,
+  QTCREATORBUG-27405)
 * Fixed that text encoding in project settings was not respected on diff
+  (QTCREATORBUG-21794)
 
 Test Integration
 ----------------
@@ -142,6 +174,8 @@ Test Integration
   ([Documentation](https://doc-snapshots.qt.io/qtcreator-9.0/creator-squish.html))
 * Catch 2
     * Fixed handling of exceptions (QTCREATORBUG-28131)
+    * Fixed crash (QTCREATORBUG-28269)
+    * Fixed handling of `WARN`, `FAIL` and `INFO` (QTCREATORBUG-28394)
 
 Platforms
 ---------
@@ -153,23 +187,43 @@ Platforms
 * Fixed issues when drives are mapped (QTCREATORBUG-27869, QTCREATORBUG-28031)
 * Fixed that output could be missing for Qt based external tools
   (QTCREATORBUG-27828)
+* Fixed that Clink and other applications could increase startup time for
+  toolchain detection (QTCREATORBUG-27906)
+* Fixed that running Qt Creator from a MSVC environment could interfere with
+  MSVC auto-detection (QTCREATORBUG-28315)
 
 ### macOS
 
 * Added auto-detection of `ccache` compilers from Homebrew (QTCREATORBUG-27792)
 * Fixed that theme partially switched between dark and light when system theme
   changed during runtime (QTCREATORBUG-28066)
+* Fixed wrong target being set for the code model for iOS kits
+  (QTCREATORBUG-28278)
+* Fixed that Touch Bar contained `Edit Bookmark` instead of `Toggle Bookmark`
+  (QTCREATORBUG-28108)
+* Fixed missing `Search` item in `Help` menu (QTCREATORBUG-24751)
+
+### Android
+
+* Fixed emulator operations when the deprecated `SDK Tools` is installed in
+  addition to `SDK Command-line Tools` (QTCREATORBUG-28196)
+* Fixed debugging over WiFi (QTCREATORBUG-28342)
 
 ### iOS
 
 * Fixed determination of Qt version when debugging
 
 ### Remote Linux
 
+* Enable usage as build device
 * Added option for SSH port to wizard
 * Added fallback for devices without `base64`
 * Added experimental support to user remote linux build devices (QTCREATORBUG-28242)
 
+### Boot to Qt
+
+* Fixed that `rsync` was not available for deployment (QTCREATORBUG-24731)
+
 ### Docker
 
 * Added option for `docker` command
@@ -181,16 +235,21 @@ Platforms
     * Added sorting of images
     * Added option to hide images without tag
     * Added double-click for selecting image
+* Fixed `Browse` button for build directory for remote directories
 * Fixed interrupting and pausing of GDB
 * Fixed running `ctest` on device
+* Fixed mounting paths with spaces or colons
+* Fixed opening remote text files without extension
 
 Credits for these changes go to:
 --------------------------------
 Aaron Barany  
+Adam Sowa  
 Alessandro Portale  
 Alexander Akulich  
 Alexander Drozdov  
 André Pönitz  
+Ari Parkkila  
 Artem Sokolovskii  
 Assam Boudjelthia  
 Björn Schäpers  
@@ -205,6 +264,7 @@ Fawzi Mohamed
 Florian Koch  
 Henning Gruendl  
 Jaroslaw Kobus  
+Kwangsub Kim  
 Leena Miettinen  
 Lucie Gérard  
 Marc Mutz  
@@ -213,6 +273,7 @@ Marcus Tillmanns
 Miikka Heikkinen  
 Orgad Shaneh  
 Piotr Mućko  
+Rainer Keller  
 Robert Löhning  
 Sergey Levin  
 Sivert Krøvel  

doc/qtcreator/src/android/androiddev.qdoc

@@ -216,7 +216,7 @@
     To start an AVD, select \uicontrol {Start AVD}. Usually, you don't need to
     start AVDs separately because they are automatically started when you
     select them in the \l{Building for Multiple Platforms}{kit selector} to
-    \l{Deploying Applications to Android Devices}{deploy applications} to them.
+    \l{Deploying to Android}{deploy applications} to them.
 
     To remove an AVD from the list and the kit selector, select
     \uicontrol {Erase AVD}.

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

@@ -6,7 +6,7 @@
     \page creator-deploying-android.html
     \nextpage creator-deployment-b2qt.html
 
-    \title Deploying Applications to Android Devices
+    \title Deploying to Android
 
     On Android, applications are distributed in specially structured types of
     ZIP packages called Application Packages (APK) or Android App Bundles (AAB).

doc/qtcreator/src/cmake/creator-projects-cmake.qdoc

@@ -176,6 +176,6 @@
         \li \l {Opening Projects}
         \li \l {CMake Build Configuration}
         \li \l {Specifying Run Settings}
-        \li \l {Deploying Applications to Generic Remote Linux Devices}
+        \li \l {Deploying to Remote Linux}
     \endlist
 */

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

@@ -162,24 +162,29 @@
 
     \section2 Debugging Tools for Windows
 
-    To use the CDB debugger, you must install the
-    \e{Debugging tools for Windows}. You can download them from
-    \l{https://developer.microsoft.com/windows/downloads/windows-10-sdk}
-    {Download and Install Debugging Tools for Windows} as part of the Windows
-    SDK.
-
-    \note Visual Studio does not include the Debugging tools needed,
-    and therefore, you must install them separately.
-
-    In addition, you must select \uicontrol {\QC CDB Debugger Support}
-    (in \uicontrol Qt > \uicontrol Tools > \uicontrol {\QC}) when you install
-    Qt or the stand-alone \QC.
+    To use the CDB debugger, install the \e {Debugging Tools for Windows} when
+    you install \QC either by using the Qt Online Installer (in \uicontrol Qt
+    > \uicontrol Tools > \uicontrol {\QC}) or by using the stand-alone \QC
+    installation packages.
+
+    The 32-bit CDB version can only debug 32-bit executables, whereas the 64-bit
+    version can debug both 64-bit and 32-bit executables. However, interrupting a
+    32-bit executable with a 64-bit debugger can result in a stacktrace of the
+    WOW64 emulator 32-bit emulation layer being displayed.
+
+    \QC extends the command line debugger by loading the
+    \c qtcreatorcdbext.dll extension library into it. The
+    library must be available in the \c {libs\qtcreatorcdbext64}
+    and \c {libs\qtcreatorcdbext32} folder. To install it there,
+    select \uicontrol {\QC CDB Debugger Support} when you install \QC.
 
     When manually building \QC using
     the Microsoft Visual C++ Compiler, the build process checks for
     the required files in
     \c{"%ProgramFiles%\Debugging Tools for Windows"}.
 
+    \section3 Symbol Server
+
     It is highly recommended that you add the Symbol Server provided
     by Microsoft to the symbol search path of the debugger. The
     Symbol Server provides you with debugging informaton for the

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

@@ -1504,8 +1504,12 @@
 
         \li Make sure you use at least \QC 3.0.1
 
-        \li Make sure the debugger is set up properly. For more information,
-            see \l{Setting Up Debugger}.
+        \li Select the \inlineimage icons/run_small.png
+            (\uicontrol Run) button to verify that the
+            \l {Running on Multiple Platforms}{build and run kit selector}
+            picked a runnable target and you can run the application.
+
+        \li Make sure the debugger is \l{Setting Up Debugger}{set up properly}.
 
         \li In the \uicontrol Debug mode, select \uicontrol View >
             \uicontrol Views > \uicontrol {Debugger Log} to open the
@@ -1516,6 +1520,8 @@
             \l{Pasting and Fetching Code Snippets}{code pasting service} before
             asking questions in the IRC (on the #qt-creator channel at Libera.Chat).
 
+            \note Error 135 usually means that a dependent DLL cannot be found.
+
     \endlist
 
     \section1 Pointer Variable Members Are Not Displayed Directly
@@ -1526,6 +1532,9 @@
     select \uicontrol {Dereference Pointers Automatically} in the context
     menu in the \uicontrol Locals and \uicontrol Expressions views.
 
+    If you cannot view variables at all, check that you selected a \e debug build
+    configuration.
+
     \section1 Structure Members Are Not Sorted According to Structure Layout
 
     By default, structure members are displayed in alphabetic order. To inspect
@@ -1536,7 +1545,9 @@
     \section1 Built-in Debugger Is Slow During Startup and Runtime
 
     Slowness that is related to the loading of debug information is hard to
-    avoid.
+    avoid. The following sections describe some possible solutions.
+
+    \section2 Caching GDB Symbol Index
 
     When using GDB as backend, you can automatically save a copy of
     its symbol index in a cache on disk and retrieve it from there
@@ -1546,12 +1557,38 @@
 
     \image qtcreator-gdb-options.png "GDB preferences"
 
-    Some slowness stems from maintaining breakpoints inside
+    \section2 Minimizing Number of Breakpoints
+
+    Some debugging slowness stems from maintaining breakpoints inside
     the debugger (under some circumstances all breakpoints need to be inserted
     and removed again for each step) and the evaluation of expressions after
     each step. We recommend that you minimize the number of breakpoints and
     watched expressions.
 
+    \section2 Cleaning Builds
+
+    If out-of-date .pdb files make debugging slower, try a clean build.
+
+    \section2 Disabling Incremental Linking
+
+    Incremental linking can affect debugging. If the debugger log contains
+    the \e {Unable to verify checksum of module} message, disable incremental
+    linking.
+
+    When using CMake as the build system, add the following line to the project
+    CMakeLists.txt file:
+
+    \badcode
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /INCREMENTAL:NO" )
+    \endcode
+
+    When using qmake as the build system, add the following line to the project
+    .pro file:
+
+    \badcode
+    QMAKE_LFLAGS_DEBUG += /INCREMENTAL:NO
+    \endcode
+
      \section1 Debugger Cannot Attach to Running Process on Linux
 
     GDB uses \c ptrace to attach to running processes. Some Linux distributions