Merge remote-tracking branch 'origin/6.0'

Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: I32991a77e52831dd2e24cf4a51ec252998c2d743

.github/workflows/build_cmake.yml

@@ -76,11 +76,24 @@ jobs:
         endif()
 
         set(ninja_url "https://github.com/ninja-build/ninja/releases/download/v${ninja_version}/ninja-${ninja_suffix}")
-        file(DOWNLOAD "${ninja_url}" ./ninja.zip SHOW_PROGRESS)
+        foreach(retry RANGE 10)
+          file(DOWNLOAD "${ninja_url}" ./ninja.zip SHOW_PROGRESS)
+          file(SIZE ./ninja.zip fileSize)
+          if (fileSize GREATER 0)
+            break()
+          endif()
+        endforeach()
+
         execute_process(COMMAND ${CMAKE_COMMAND} -E tar xvf ./ninja.zip)
 
         set(cmake_url "https://github.com/Kitware/CMake/releases/download/v${cmake_version}/cmake-${cmake_version}-${cmake_suffix}")
-        file(DOWNLOAD "${cmake_url}" ./cmake.zip SHOW_PROGRESS)
+        foreach(retry RANGE 10)
+          file(DOWNLOAD "${cmake_url}" ./cmake.zip SHOW_PROGRESS)
+          file(SIZE ./cmake.zip fileSize)
+          if (fileSize GREATER 0)
+            break()
+          endif()
+        endforeach()
         execute_process(COMMAND ${CMAKE_COMMAND} -E tar xvf ./cmake.zip)
 
         # Add to PATH environment variable
@@ -357,7 +370,13 @@ jobs:
       shell: cmake -P {0}
       run: |
         set(ccache_url "https://github.com/cristianadam/ccache/releases/download/v$ENV{CCACHE_VERSION}/${{ runner.os }}.tar.xz")
-        file(DOWNLOAD "${ccache_url}" ./ccache.tar.xz SHOW_PROGRESS)
+        foreach(retry RANGE 10)
+          file(DOWNLOAD "${ccache_url}" ./ccache.tar.xz SHOW_PROGRESS)
+          file(SIZE ./ccache.tar.xz fileSize)
+          if (fileSize GREATER 0)
+            break()
+          endif()
+        endforeach()
         execute_process(COMMAND ${CMAKE_COMMAND} -E tar xvf ./ccache.tar.xz)
 
     - name: Prepare ccache archive name
@@ -393,11 +412,19 @@ jobs:
             string(JSON name GET "${artifact_js}" "name")
             if ("${name}" STREQUAL "${{ steps.ccache.outputs.archive_name }}")
               string(JSON download_url GET "${artifact_js}" "archive_download_url")
-              file(DOWNLOAD "${download_url}"
+
-                "${{ steps.ccache.outputs.archive_name }}.zip"
+              foreach(retry RANGE 10)
-                NETRC_FILE "$ENV{GITHUB_WORKSPACE}/netrc.txt"
+                file(DOWNLOAD "${download_url}"
-                NETRC REQUIRED
+                  "${{ steps.ccache.outputs.archive_name }}.zip"
-                SHOW_PROGRESS)
+                  NETRC_FILE "$ENV{GITHUB_WORKSPACE}/netrc.txt"
+                  NETRC REQUIRED
+                  SHOW_PROGRESS)
+                file(SIZE "${{ steps.ccache.outputs.archive_name }}.zip" fileSize)
+                if (fileSize GREATER 0)
+                  break()
+                endif()
+              endforeach()
+
               execute_process(COMMAND ${CMAKE_COMMAND} -E tar xvf "${{ steps.ccache.outputs.archive_name }}.zip")
               file(MAKE_DIRECTORY .ccache)
               execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf "../${{ steps.ccache.outputs.archive_name }}.tar" WORKING_DIRECTORY .ccache)
@@ -541,6 +568,7 @@ jobs:
       run: |
         include(ProcessorCount)
         ProcessorCount(N)
+        math(EXPR N "(75 * ${N}) / 100")
 
         set(ENV{CTEST_OUTPUT_ON_FAILURE} "ON")
 

cmake/Findyaml-cpp.cmake

@@ -9,7 +9,7 @@
 find_package(yaml-cpp 0.5 QUIET NO_MODULE)
 if (yaml-cpp_FOUND)
   # target doesn't set include directory for some reason
-  get_filename_component(yaml_cpp_include_dir ${YAML_CPP_INCLUDE_DIR} ABSOLUTE)
+  get_filename_component(yaml_cpp_include_dir "${YAML_CPP_INCLUDE_DIR}" ABSOLUTE)
   if (NOT EXISTS yaml_cpp_include_dir)
     unset(yaml_cpp_include_dir)
     unset(yaml_cpp_include_dir CACHE)

doc/qtcreator/config/qtcreator-project.qdocconf

@@ -15,21 +15,7 @@ ignorewords += \
 headerdirs =
 sourcedirs = ../src
 
-imagedirs = ../images \
+imagedirs = ../images
-            ../../../src/libs/qmleditorwidgets/images \
-            ../../../src/libs/utils/images \
-            ../../../src/plugins/android/images \
-            ../../../src/plugins/autotest/images \
-            ../../../src/plugins/classview/images \
-            ../../../src/plugins/coreplugin/images \
-            ../../../src/plugins/debugger/images \
-            ../../../src/plugins/diffeditor/images \
-            ../../../src/plugins/help/images \
-            ../../../src/plugins/projectexplorer/images \
-            ../../../src/plugins/scxmleditor/common/images \
-            ../../../src/plugins/texteditor/images \
-            ../../../src/plugins/valgrind/images \
-            ../../../src/plugins/welcome/images
 
 exampledirs = ../examples
 examples.fileextensions += *.qml *.svg