Merge "Merge remote-tracking branch 'origin/14.0' into qds/dev" into qds/dev

.github/workflows/build_cmake.yml

@@ -7,9 +7,9 @@ on:
       - 'doc/**'
 
 env:
-  QT_VERSION: 6.6.2
+  QT_VERSION: 6.7.1
   MACOS_DEPLOYMENT_TARGET: 11.0
-  CLANG_VERSION: 17.0.1
+  CLANG_VERSION: 18.1.7
   ELFUTILS_VERSION: 0.175
   CMAKE_VERSION: 3.21.1
   NINJA_VERSION: 1.10.2
@@ -49,13 +49,12 @@ jobs:
           }
         - {
             name: "macOS Latest Clang", artifact: "macos-universal",
-            # TODO: move back to macos-latest when macos-latest is 13 or higher
-            os: macos-13,
+            os: macos-latest,
             cc: "clang", cxx: "clang++"
           }
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Checkout submodules
       id: git
       shell: cmake -P {0}
@@ -63,10 +62,10 @@ jobs:
         execute_process(COMMAND git submodule set-url -- perfparser https://code.qt.io/qt-creator/perfparser.git)
         execute_process(COMMAND git submodule update --init --recursive)
         file(MAKE_DIRECTORY release)
-        if (${{github.ref}} MATCHES "tags/v([0-9.]+)")
+        if (${{github.ref}} MATCHES "tags/v(([0-9.]+).*)")
             file(APPEND "$ENV{GITHUB_OUTPUT}" "tag=${CMAKE_MATCH_1}\n")
-            if (EXISTS "dist/changelog/changes-${CMAKE_MATCH_1}.md")
-                file(READ "dist/changelog/changes-${CMAKE_MATCH_1}.md" changelog_md)
+            if (EXISTS "dist/changelog/changes-${CMAKE_MATCH_2}.md")
+                file(READ "dist/changelog/changes-${CMAKE_MATCH_2}.md" changelog_md)
             endif()
             file(WRITE "release/changelog.md" "These packages are not officially supported, for official packages please check out https://download.qt.io/official_releases/qtcreator\n\n")
             file(APPEND "release/changelog.md" "${changelog_md}")
@@ -200,7 +199,7 @@ jobs:
           endif()
         elseif ("${{ runner.os }}" STREQUAL "Linux")
           set(url_os "linux_x64")
-          set(qt_package_arch_suffix "gcc_64")
+          set(qt_package_arch_suffix "linux_gcc_64")
           set(qt_dir_prefix "${qt_version}/gcc_64")
           set(qt_package_suffix "-Linux-RHEL_8_8-GCC-Linux-RHEL_8_8-X86_64")
         elseif ("${{ runner.os }}" STREQUAL "macOS")
@@ -267,10 +266,10 @@ jobs:
           )
         endforeach()
 
-        # uic depends on libicu56.so
+        # uic, qmake depend on libicu*.so libraries
         if ("${{ runner.os }}" STREQUAL "Linux")
           downloadAndExtract(
-            "${qt_base_url}/qt.qt6.${qt_version_dotless}.${qt_package_arch_suffix}/${qt_package_version}icu-linux-Rhel7.2-x64.7z"
+            "${qt_base_url}/qt.qt6.${qt_version_dotless}.${qt_package_arch_suffix}/${qt_package_version}icu-linux-Rhel8.6-x86_64.7z"
             icu.7z
           )
         endif()
@@ -695,41 +694,41 @@ jobs:
         endif()
 
     - name: Upload
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         path: build/qtcreator-${{ matrix.config.artifact }}-${{ steps.git.outputs.tag }}.7z
         name: qtcreator-${{ matrix.config.artifact }}-${{ steps.git.outputs.tag }}.7z
 
     - name: Upload Devel
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         path: build/qtcreator-${{ matrix.config.artifact }}-${{ steps.git.outputs.tag }}_dev.7z
         name: qtcreator-${{ matrix.config.artifact }}-${{ steps.git.outputs.tag }}_dev.7z
 
     - name: Upload wininterrupt
       if: runner.os == 'Windows'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         path: build/wininterrupt-${{ matrix.config.artifact }}-${{ steps.git.outputs.tag }}.7z
         name: wininterrupt-${{ matrix.config.artifact }}-${{ steps.git.outputs.tag }}.7z
 
     - name: Upload qtcreatorcdbext
       if: runner.os == 'Windows' && matrix.config.is_msvc
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         path: build/qtcreatorcdbext-${{ matrix.config.artifact }}-${{ steps.git.outputs.tag }}.7z
         name: qtcreatorcdbext-${{ matrix.config.artifact }}-${{ steps.git.outputs.tag }}.7z
 
     - name: Upload Debian package
       if: runner.os == 'Linux'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         path: build/build/qtcreator-${{ matrix.config.artifact }}-${{ steps.git.outputs.tag }}.deb
         name: qtcreator-${{ matrix.config.artifact }}-${{ steps.git.outputs.tag }}.deb
 
     - name: Upload disk image
       if: runner.os == 'macOS' && contains(github.ref, 'tags/v')
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         path: build/qt-creator-${{ matrix.config.artifact }}-${{ steps.git.outputs.tag }}.dmg
         name: qt-creator-${{ matrix.config.artifact }}-${{ steps.git.outputs.tag }}.dmg
@@ -739,14 +738,14 @@ jobs:
       run: cmake -E tar cf ../${{ steps.ccache.outputs.archive_name }}.tar .
 
     - name: Upload ccache archive
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         path: ./${{ steps.ccache.outputs.archive_name }}.tar
         name: ${{ steps.ccache.outputs.archive_name }}
 
     - name: Upload Release Changelog
-      if: contains(github.ref, 'tags/v')
-      uses: actions/upload-artifact@v3
+      if: runner.os == 'macOS' && contains(github.ref, 'tags/v')
+      uses: actions/upload-artifact@v4
       with:
         path: ./release/changelog.md
         name: changelog.md
@@ -758,7 +757,7 @@ jobs:
 
     steps:
     - name: Download artifacts
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         path: release-with-dirs
 
@@ -770,7 +769,7 @@ jobs:
 
     - name: Create Release
       id: create_release
-      uses: softprops/action-gh-release@v1
+      uses: softprops/action-gh-release@v2
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:

.luarc.json

@@ -0,0 +1,9 @@
+{
+    "workspace.library": [
+        "src/plugins/lua/meta"
+    ],
+    "hint.paramName": "Literal",
+    "hint.enable": true,
+    "hint.await": true,
+    "hint.arrayIndex": "Disable"
+}

README.md

@@ -38,12 +38,12 @@ https://doc.qt.io/qtcreator-extending/coding-style.html
 
 Prerequisites:
 
-* Qt 6.2 or later. The Qt version that you use to build Qt Creator defines the
+* Qt 6.4.3 or later. The Qt version that you use to build Qt Creator defines the
   minimum platform versions that the result supports
-  (Windows 10, RHEL/CentOS 8.4, Ubuntu 20.04, macOS 10.15 for Qt 6.2).
+  (Windows 10, RHEL/CentOS 8.4, Ubuntu 20.04, macOS 10.15 for Qt 6.4.3).
 * Qt WebEngine module for QtWebEngine based help viewer
 * On Windows:
-    * MinGW with GCC 9 or Visual Studio 2019 or later
+    * MinGW with GCC 11.2 or Visual Studio 2019 or later
     * Python 3.8 or later (optional, needed for the python enabled debug helper)
     * Debugging Tools for Windows (optional, for MSVC debugging support with CDB)
 * On Mac OS X: latest Xcode
@@ -96,7 +96,7 @@ include the version number and compiler ABI. The path to the online installer
 content is not enough.
 
 Note that `/path/to/Qt` doesn't imply the full path depth like:
-`$USER/Qt/6.2.4/gcc_64/lib/cmake/Qt6`, but only `$USER/Qt/6.2.4/gcc_64`.
+`$USER/Qt/6.4.3/gcc_64/lib/cmake/Qt6`, but only `$USER/Qt/6.4.3/gcc_64`.
 
 See [instructions](#getting-llvmclang-for-the-clang-code-model) on how to
 get LLVM.
@@ -107,6 +107,33 @@ get LLVM.
     cmake -DCMAKE_BUILD_TYPE=Debug -G Ninja "-DCMAKE_PREFIX_PATH=/path/to/Qt;/path/to/llvm" /path/to/qtcreator_sources
     cmake --build .
 
+#### Troubleshooting: libxcb plugin not found while using Qt libraries built locally from source
+
+Ensure all prerequisites for building Qt are installed:
+https://doc.qt.io/qt-6/linux.html
+https://doc.qt.io/qt-6/linux-requirements.html
+
+If they were installed before building Qt and xcb plugin is missing try reinstall them with
+
+```sh
+    sudo apt-get --reinstall <package_name>
+```
+
+Reset building configuration for Qt libraries at '/path/to/qt_sources'
+
+```sh
+    cmake --build . --target=clean
+```
+
+and remove CMakeCache.txt
+
+```sh
+    rm CMakeCache.txt
+```
+
+Try building Qt source again.
+
+
 ### Windows
 
 These instructions assume that Ninja is installed and in the `PATH`, Qt Creator
@@ -118,7 +145,7 @@ include the version number and compiler ABI. The path to the online installer
 content is not enough.
 
 Note that `\path\to\Qt` doesn't imply the full path depth like:
-`c:\Qt\6.2.4\msvc2019_64\lib\cmake\Qt6`, but only `c:/Qt/6.2.4/msvc2019_64`.
+`c:\Qt\6.4.3\msvc2019_64\lib\cmake\Qt6`, but only `c:/Qt/6.4.3/msvc2019_64`.
 The usage of slashes `/` is intentional, since CMake has issues with backslashes `\`
 in `CMAKE_PREFX_PATH`, they are interpreted as escape codes.
 
@@ -198,7 +225,7 @@ CLion...etc) locally:
       "cacheVariables": {
         "CMAKE_CXX_COMPILER": "cl.exe",
         "CMAKE_C_COMPILER": "cl.exe",
-        "CMAKE_PREFIX_PATH": "c:/Qt/6.2.4/msvc2019_64"
+        "CMAKE_PREFIX_PATH": "c:/Qt/6.4.3/msvc2019_64"
       }
     }
   ]
@@ -286,7 +313,7 @@ http://llvm.org/docs/GettingStarted.html#git-mirror:
 
    1. Clone LLVM/Clang and checkout a suitable branch
 
-          git clone -b release_130-based --recursive https://code.qt.io/clang/llvm-project.git
+          git clone -b release_17.0.6-based --recursive https://code.qt.io/clang/llvm-project.git
 
    2. Build and install LLVM/Clang
 
@@ -314,16 +341,6 @@ http://llvm.org/docs/GettingStarted.html#git-mirror:
             ..\llvm-project\llvm
           cmake --build . --target install
 
-### Clang-Format
-
-The ClangFormat plugin depends on the additional patch
-
-    https://code.qt.io/cgit/clang/llvm-project.git/commit/?h=release_130-based&id=42879d1f355fde391ef46b96a659afeb4ad7814a
-
-While the plugin builds without it, it might not be fully functional.
-
-Note that the plugin is disabled by default.
-
 # Licenses and Attributions
 
 Qt Creator is available under commercial licenses from The Qt Company,

cmake/QtCreatorAPI.cmake

@@ -3,7 +3,7 @@ if(QT_CREATOR_API_DEFINED)
 endif()
 set(QT_CREATOR_API_DEFINED TRUE)
 
-set(IDE_QT_VERSION_MIN "6.2.0")
+set(IDE_QT_VERSION_MIN "6.4.3")
 
 include(${CMAKE_CURRENT_LIST_DIR}/QtCreatorAPIInternal.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/QtcSeparateDebugInfo.cmake)

cmake/QtCreatorAPIInternal.cmake

@@ -23,6 +23,7 @@ list(APPEND DEFAULT_DEFINES
   QT_NO_JAVA_STYLE_ITERATORS
   QT_NO_CAST_TO_ASCII QT_RESTRICTED_CAST_FROM_ASCII QT_NO_FOREACH
   QT_DISABLE_DEPRECATED_BEFORE=0x050900
+  QT_WARN_DEPRECATED_BEFORE=0x060400
   QT_USE_QSTRINGBUILDER
 )
 

cmake/QtCreatorDocumentation.cmake

@@ -5,6 +5,18 @@ add_feature_info("Build documentation" WITH_DOCS "")
 option(WITH_ONLINE_DOCS "Build online documentation" OFF)
 add_feature_info("Build online documentation" WITH_ONLINE_DOCS "")
 
+option(BUILD_DOCS_BY_DEFAULT "Build documentation by default" OFF)
+add_feature_info("Build documentation by default" BUILD_DOCS_BY_DEFAULT "")
+
+
+if (BUILD_DOCS_BY_DEFAULT)
+set(EXCLUDE_DOCS_FROM_ALL "")
+set(INCLUDE_DOCS_INTO_ALL "ALL")
+else()
+set(EXCLUDE_DOCS_FROM_ALL "EXCLUDE_FROM_ALL")
+set(INCLUDE_DOCS_INTO_ALL "")
+endif()
+
 # Get information on directories from qmake
 # as this is not yet exported by cmake.
 # Used for QT_INSTALL_DOCS
@@ -46,13 +58,13 @@ endfunction()
 function(_setup_doc_targets)
   # Set up important targets:
   if (NOT TARGET html_docs)
-    add_custom_target(html_docs COMMENT "Build HTML documentation")
+    add_custom_target(html_docs ${INCLUDE_DOCS_INTO_ALL} COMMENT "Build HTML documentation")
   endif()
   if (NOT TARGET qch_docs)
-    add_custom_target(qch_docs COMMENT "Build QCH documentation")
+    add_custom_target(qch_docs ${INCLUDE_DOCS_INTO_ALL} COMMENT "Build QCH documentation")
   endif()
   if (NOT TARGET docs)
-    add_custom_target(docs COMMENT "Build documentation")
+    add_custom_target(docs ${INCLUDE_DOCS_INTO_ALL} COMMENT "Build documentation")
     add_dependencies(docs html_docs qch_docs)
   endif()
 endfunction()
@@ -114,6 +126,7 @@ function(_setup_qdoc_targets _qdocconf_file _retval)
 
   set(_html_target "html_docs_${_target}")
   add_custom_target("${_html_target}"
+      ${INCLUDE_DOCS_INTO_ALL}
       ${_full_qdoc_command} -outputdir "${_html_outputdir}" "${_qdocconf_file}"
       ${_qdoc_index_args} ${_qdoc_include_args}
     COMMENT "Build HTML documentation from ${_qdocconf_file}"
@@ -126,7 +139,7 @@ function(_setup_qdoc_targets _qdocconf_file _retval)
 
   # Install HTML files as a special component
   install(DIRECTORY "${_html_outputdir}" DESTINATION "${_arg_INSTALL_DIR}"
-    COMPONENT html_docs EXCLUDE_FROM_ALL)
+    COMPONENT html_docs ${EXCLUDE_DOCS_FROM_ALL})
 
   set("${_retval}" "${_html_outputdir}" PARENT_SCOPE)
 endfunction()
@@ -154,6 +167,7 @@ function(_setup_qhelpgenerator_targets _qdocconf_file _html_outputdir)
   set(_qch_target "qch_docs_${_target}")
   set(_html_target "html_docs_${_target}")
   add_custom_target("${_qch_target}"
+    ${INCLUDE_DOCS_INTO_ALL}
     Qt::qhelpgenerator "${_html_outputdir}/${_target}.qhp" -o "${_qch_outputdir}/${_target}.qch"
     COMMENT "Build QCH documentation from ${_qdocconf_file}"
     WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
@@ -163,7 +177,7 @@ function(_setup_qhelpgenerator_targets _qdocconf_file _html_outputdir)
   add_dependencies(qch_docs "${_qch_target}")
 
   install(FILES "${_qch_outputdir}/${_target}.qch" DESTINATION "${_arg_INSTALL_DIR}"
-    COMPONENT qch_docs EXCLUDE_FROM_ALL)
+    COMPONENT qch_docs ${EXCLUDE_DOCS_FROM_ALL})
 endfunction()
 
 # Helper functions:
@@ -283,6 +297,7 @@ function(add_qtc_doc_attribution target attribution_file output_file qdocconf_fi
   file(MAKE_DIRECTORY ${output_dir})
   # add target
   add_custom_target(${target}
+      ${INCLUDE_DOCS_INTO_ALL}
       Qt6::qtattributionsscanner -o "${output_file}" --basedir "${PROJECT_SOURCE_DIR}" ${attribution_file}
     COMMENT "Create attributions ${output_file} from ${attribution_file}"
     DEPENDS "${attribution_file}"

cmake/QtCreatorIDEBranding.cmake

@@ -1,6 +1,6 @@
-set(IDE_VERSION "13.0.2")                             # The IDE version.
-set(IDE_VERSION_COMPAT "13.0.0")                      # The IDE Compatibility version.
-set(IDE_VERSION_DISPLAY "13.0.2")                     # The IDE display version.
+set(IDE_VERSION "13.0.84")                            # The IDE version.
+set(IDE_VERSION_COMPAT "13.0.84")                     # The IDE Compatibility version.
+set(IDE_VERSION_DISPLAY "14.0.0-rc1")               # The IDE display version.
 set(IDE_COPYRIGHT_YEAR "2024")                        # The IDE current copyright year.
 
 set(IDE_SETTINGSVARIANT "QtProject")                  # The IDE settings variation.

coin/instructions/build.yaml

@@ -20,29 +20,29 @@ instructions:
         maxTimeBetweenOutput: 360
         userMessageOnFailure: "Failed to download elfutils package, check logs."
       - type: ExecuteCommand
-        command: "/usr/bin/7z x -y {{.AgentWorkingDir}}/build/qt_temp/elfutils-release_0.175qt-linux-x86_64.7z -o{{.AgentWorkingDir}}/build/qt_temp/elfutils"
+        command: "7z x -y {{.AgentWorkingDir}}/build/qt_temp/elfutils-release_0.175qt-linux-x86_64.7z -o{{.AgentWorkingDir}}/build/qt_temp/elfutils"
         maxTimeInSeconds: 3600
         maxTimeBetweenOutput: 360
         userMessageOnFailure: "Failed to extract elfutils package, check logs."
       - type: ExecuteCommand
-        command: "curl --fail -L --retry 5 --retry-delay 5 -o {{.AgentWorkingDir}}/build/qt_temp/libclang.7z {{.Env.LLVM_BASE_URL}}-linux-Rhel8.4-gcc10.3-x86_64.7z"
+        command: "curl --fail -L --retry 5 --retry-delay 5 -o {{.AgentWorkingDir}}/build/qt_temp/libclang.7z {{.Env.LLVM_BASE_URL}}-linux-Rhel8.6-gcc10.3-x86_64.7z"
         maxTimeInSeconds: 3600
         maxTimeBetweenOutput: 360
         userMessageOnFailure: "Failed to download LLVM package, check logs."
       - type: ExecuteCommand
-        command: "/usr/bin/7z x -y {{.AgentWorkingDir}}/build/qt_temp/libclang.7z -o{{.AgentWorkingDir}}/build/qt_temp/"
+        command: "7z x -y {{.AgentWorkingDir}}/build/qt_temp/libclang.7z -o{{.AgentWorkingDir}}/build/qt_temp/"
         maxTimeInSeconds: 3600
         maxTimeBetweenOutput: 360
         userMessageOnFailure: "Failed to extract LLVM package, check logs."
       - type: ExecuteCommand
-        command: "python3 -u {{.AgentWorkingDir}}/qt-creator/qt-creator/scripts/build.py --build-type {{.Env.QTC_BUILD_TYPE}} --src {{.AgentWorkingDir}}/qt-creator/qt-creator --build {{.AgentWorkingDir}}/qt-creator/qt-creator_build --qt-path {{.AgentWorkingDir}}/build/qt_install_dir --elfutils-path {{.AgentWorkingDir}}/build/qt_temp/elfutils --llvm-path {{.AgentWorkingDir}}/build/qt_temp/libclang {{.Env.QTC_TEST_OPTION}} --no-zip --add-config=-DCMAKE_C_COMPILER_LAUNCHER=sccache --add-config=-DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
+        command: "python3 -u {{.AgentWorkingDir}}/qt-creator/qt-creator/scripts/build.py --build-type {{.Env.QTC_BUILD_TYPE}} --src {{.AgentWorkingDir}}/qt-creator/qt-creator --build {{.AgentWorkingDir}}/qt-creator/qt-creator_build --qt-path {{.AgentWorkingDir}}/build/qt_install_dir --elfutils-path {{.AgentWorkingDir}}/build/qt_temp/elfutils --llvm-path {{.AgentWorkingDir}}/build/qt_temp/libclang {{.Env.QTC_TEST_OPTION}} --no-zip {{.Env.QTC_SCCACHE_C_OPTION}} {{.Env.QTC_SCCACHE_CXX_OPTION}} {{.Env.QTC_SCCACHE_ENABLE_OPTION}}"
         maxTimeInSeconds: 36000
         maxTimeBetweenOutput: 3600
         userMessageOnFailure: "Failed to run build.py, check logs."
       - type: ChangeDirectory
         directory: "{{.AgentWorkingDir}}/build/tqtc-qtsdk/packaging_tools"
       - type: ExecuteCommand
-        command: "python3 -m pipenv run python -u bld_sdktool.py --qt-url {{.Env.QTC_SDKTOOL_QT_BASE_URL}}{{.Env.QTC_SDKTOOL_QT_EXT}} --qt-build {{.AgentWorkingDir}}/build/sdktool/qt --src {{.AgentWorkingDir}}/qt-creator/qt-creator/src/tools/sdktool --build {{.AgentWorkingDir}}/build/sdktool/build --install {{.AgentWorkingDir}}/build/sdktool/install --make-command make"
+        command: "python3 -m pipenv run python -u bld_sdktool.py --qt-url {{.Env.QTC_SDKTOOL_QT_BASE_URL}}{{.Env.QTC_SDKTOOL_QT_EXT}} --qt-build {{.AgentWorkingDir}}/build/sdktool/qt --src {{.AgentWorkingDir}}/qt-creator/qt-creator/src/tools/sdktool --build {{.AgentWorkingDir}}/build/sdktool/build --install {{.AgentWorkingDir}}/build/sdktool/install --make-command ninja"
         maxTimeInSeconds: 36000
         maxTimeBetweenOutput: 3600
         userMessageOnFailure: "Failed to build sdktool, check logs."
@@ -64,12 +64,12 @@ instructions:
         maxTimeBetweenOutput: 360
         userMessageOnFailure: "Failed to download LLVM package, check logs."
       - type: ExecuteCommand
-        command: "/usr/local/bin/7z x -y {{.AgentWorkingDir}}/build/qt_temp/libclang.7z -o{{.AgentWorkingDir}}/build/qt_temp/"
+        command: "7z x -y {{.AgentWorkingDir}}/build/qt_temp/libclang.7z -o{{.AgentWorkingDir}}/build/qt_temp/"
         maxTimeInSeconds: 3600
         maxTimeBetweenOutput: 360
         userMessageOnFailure: "Failed to extract LLVM package, check logs."
       - type: ExecuteCommand
-        command: "python3 -u {{.AgentWorkingDir}}/qt-creator/qt-creator/scripts/build.py --build-type {{.Env.QTC_BUILD_TYPE}} --src {{.AgentWorkingDir}}/qt-creator/qt-creator --build {{.AgentWorkingDir}}/qt-creator/qt-creator_build --qt-path {{.AgentWorkingDir}}/build/qt_install_dir --llvm-path {{.AgentWorkingDir}}/build/qt_temp/libclang --keychain-unlock-script /Users/qt/unlock-keychain.sh {{.Env.QTC_TEST_OPTION}} --no-zip --add-config=-DCMAKE_C_COMPILER_LAUNCHER=sccache --add-config=-DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
+        command: "python3 -u {{.AgentWorkingDir}}/qt-creator/qt-creator/scripts/build.py --build-type {{.Env.QTC_BUILD_TYPE}} --src {{.AgentWorkingDir}}/qt-creator/qt-creator --build {{.AgentWorkingDir}}/qt-creator/qt-creator_build --qt-path {{.AgentWorkingDir}}/build/qt_install_dir --llvm-path {{.AgentWorkingDir}}/build/qt_temp/libclang --keychain-unlock-script /Users/qt/unlock-keychain.sh {{.Env.QTC_TEST_OPTION}} --no-zip {{.Env.QTC_SCCACHE_C_OPTION}} {{.Env.QTC_SCCACHE_CXX_OPTION}} {{.Env.QTC_SCCACHE_ENABLE_OPTION}}"
         maxTimeInSeconds: 36000
         maxTimeBetweenOutput: 3600
         userMessageOnFailure: "Failed to run build.py, check logs."
@@ -79,7 +79,7 @@ instructions:
         variableName: MACOSX_DEPLOYMENT_TARGET
         variableValue: "{{.Env.SDKTOOL_MACOSX_DEPLOYMENT_TARGET}}"
       - type: ExecuteCommand
-        command: "python3 -m pipenv run python -u bld_sdktool.py --qt-url {{.Env.QTC_SDKTOOL_QT_BASE_URL}}{{.Env.QTC_SDKTOOL_QT_EXT}} --qt-build {{.AgentWorkingDir}}/build/sdktool/qt --src {{.AgentWorkingDir}}/qt-creator/qt-creator/src/tools/sdktool --build {{.AgentWorkingDir}}/build/sdktool/build --install {{.AgentWorkingDir}}/build/sdktool/install --make-command make"
+        command: "python3 -m pipenv run python -u bld_sdktool.py --qt-url {{.Env.QTC_SDKTOOL_QT_BASE_URL}}{{.Env.QTC_SDKTOOL_QT_EXT}} --qt-build {{.AgentWorkingDir}}/build/sdktool/qt --src {{.AgentWorkingDir}}/qt-creator/qt-creator/src/tools/sdktool --build {{.AgentWorkingDir}}/build/sdktool/build --install {{.AgentWorkingDir}}/build/sdktool/install --make-command ninja --universal"
         maxTimeInSeconds: 36000
         maxTimeBetweenOutput: 3600
         userMessageOnFailure: "Failed to build sdktool, check logs."
@@ -96,7 +96,7 @@ instructions:
         maxTimeBetweenOutput: 360
         userMessageOnFailure: "Failed to download elfutils package, check logs."
       - type: ExecuteCommand
-        command: "C:\\Utils\\sevenzip\\7z.exe x -y {{.AgentWorkingDir}}\\build\\qt_temp\\elfutils-release_0.175qt-windows-x86_64.7z -o{{.AgentWorkingDir}}\\build\\qt_temp\\elfutils"
+        command: "7z.exe x -y {{.AgentWorkingDir}}\\build\\qt_temp\\elfutils-release_0.175qt-windows-x86_64.7z -o{{.AgentWorkingDir}}\\build\\qt_temp\\elfutils"
         maxTimeInSeconds: 3600
         maxTimeBetweenOutput: 360
         userMessageOnFailure: "Failed to extract elfutils package, check logs."
@@ -106,7 +106,7 @@ instructions:
         maxTimeBetweenOutput: 360
         userMessageOnFailure: "Failed to download python package, check logs."
       - type: ExecuteCommand
-        command: "C:\\Utils\\sevenzip\\7z.exe x -y {{.AgentWorkingDir}}\\build\\qt_temp\\Python38-win-x64.7z -o{{.AgentWorkingDir}}\\build\\qt_temp\\python"
+        command: "7z.exe x -y {{.AgentWorkingDir}}\\build\\qt_temp\\Python38-win-x64.7z -o{{.AgentWorkingDir}}\\build\\qt_temp\\python"
         maxTimeInSeconds: 3600
         maxTimeBetweenOutput: 360
         userMessageOnFailure: "Failed to extract python package, check logs."
@@ -116,19 +116,19 @@ instructions:
         maxTimeBetweenOutput: 360
         userMessageOnFailure: "Failed to download LLVM package, check logs."
       - type: ExecuteCommand
-        command: "C:\\Utils\\sevenzip\\7z.exe x -y {{.AgentWorkingDir}}\\build\\qt_temp\\libclang.7z -o{{.AgentWorkingDir}}\\build\\qt_temp\\"
+        command: "7z.exe x -y {{.AgentWorkingDir}}\\build\\qt_temp\\libclang.7z -o{{.AgentWorkingDir}}\\build\\qt_temp\\"
         maxTimeInSeconds: 3600
         maxTimeBetweenOutput: 360
         userMessageOnFailure: "Failed to extract LLVM package, check logs."
       - type: ExecuteCommand
-        command: "python -u {{.AgentWorkingDir}}\\qt-creator\\qt-creator\\scripts\\build.py --build-type {{.Env.QTC_BUILD_TYPE}} --src {{.AgentWorkingDir}}\\qt-creator\\qt-creator --build {{.AgentWorkingDir}}\\qt-creator\\qt-creator_build --qt-path {{.AgentWorkingDir}}/build/qt_install_dir --python-path {{.AgentWorkingDir}}\\build\\qt_temp\\python --elfutils-path {{.AgentWorkingDir}}\\buid\\qt_temp\\elfutils --llvm-path {{.AgentWorkingDir}}\\build\\qt_temp\\libclang {{.Env.QTC_TEST_OPTION}} --no-zip --add-config=-DCMAKE_C_COMPILER_LAUNCHER=sccache --add-config=-DCMAKE_CXX_COMPILER_LAUNCHER=sccache --add-config=-DWITH_SCCACHE_SUPPORT=ON"
+        command: "python -u {{.AgentWorkingDir}}\\qt-creator\\qt-creator\\scripts\\build.py --build-type {{.Env.QTC_BUILD_TYPE}} --src {{.AgentWorkingDir}}\\qt-creator\\qt-creator --build {{.AgentWorkingDir}}\\qt-creator\\qt-creator_build --qt-path {{.AgentWorkingDir}}/build/qt_install_dir --python-path {{.AgentWorkingDir}}\\build\\qt_temp\\python --elfutils-path {{.AgentWorkingDir}}\\buid\\qt_temp\\elfutils --llvm-path {{.AgentWorkingDir}}\\build\\qt_temp\\libclang {{.Env.QTC_TEST_OPTION}} --no-zip {{.Env.QTC_SCCACHE_C_OPTION}} {{.Env.QTC_SCCACHE_CXX_OPTION}} {{.Env.QTC_SCCACHE_ENABLE_OPTION}}"
         maxTimeInSeconds: 36000
         maxTimeBetweenOutput: 3600
         userMessageOnFailure: "Failed to run build.py, check logs."
       - type: ChangeDirectory
         directory: "{{.AgentWorkingDir}}\\build\\tqtc-qtsdk\\packaging_tools"
       - type: ExecuteCommand
-        command: "python -m pipenv run python -u bld_sdktool.py --qt-url {{.Env.QTC_SDKTOOL_QT_BASE_URL}}{{.Env.QTC_SDKTOOL_QT_EXT}} --qt-build {{.AgentWorkingDir}}\\build\\sdktool\\qt --src {{.AgentWorkingDir}}\\qt-creator\\qt-creator\\src\\tools\\sdktool --build {{.AgentWorkingDir}}\\build\\sdktool\\build --install {{.AgentWorkingDir}}\\build\\sdktool\\install --make-command nmake"
+        command: "python -m pipenv run python -u bld_sdktool.py --qt-url {{.Env.QTC_SDKTOOL_QT_BASE_URL}}{{.Env.QTC_SDKTOOL_QT_EXT}} --qt-build {{.AgentWorkingDir}}\\build\\sdktool\\qt --src {{.AgentWorkingDir}}\\qt-creator\\qt-creator\\src\\tools\\sdktool --build {{.AgentWorkingDir}}\\build\\sdktool\\build --install {{.AgentWorkingDir}}\\build\\sdktool\\install --make-command ninja"
         maxTimeInSeconds: 36000
         maxTimeBetweenOutput: 3600
         userMessageOnFailure: "Failed to build sdktool, check logs."
@@ -142,38 +142,6 @@ instructions:
           property: target.arch
           equals_value: X86_64
 
-  - type: Group
-    instructions:
-      - type: MakeDirectory
-        directory: "{{.AgentWorkingDir}}/build/qt_temp"
-        maxTimeInSeconds: 3600
-        maxTimeBetweenOutput: 360
-        userMessageOnFailure: "Failed to create folder qt_temp, check logs."
-      - type: ExecuteCommand
-        command: "curl --fail -L --retry 5 --retry-delay 5 -o {{.AgentWorkingDir}}\\build\\qt_temp\\Python38-win-x86.7z https://master.qt.io/development_releases/prebuilt/python/Python38-win-x86.7z"
-        maxTimeInSeconds: 3600
-        maxTimeBetweenOutput: 360
-        userMessageOnFailure: "Failed to download python package, check logs."
-      - type: ExecuteCommand
-        command: "C:\\Utils\\sevenzip\\7z.exe x -y {{.AgentWorkingDir}}\\build\\qt_temp\\Python38-win-x86.7z -o{{.AgentWorkingDir}}\\build\\qt_temp\\python"
-        maxTimeInSeconds: 3600
-        maxTimeBetweenOutput: 360
-        userMessageOnFailure: "Failed to extract python package, check logs."
-      - type: ExecuteCommand
-        command: "python -u {{.AgentWorkingDir}}\\qt-creator\\qt-creator\\scripts\\build.py --build-type {{.Env.QTC_BUILD_TYPE}} --src {{.AgentWorkingDir}}\\qt-creator\\qt-creator --build {{.AgentWorkingDir}}\\qt-creator\\qt-creator_build --python-path {{.AgentWorkingDir}}\\buid\\qt_temp\\python --no-qtcreator --no-zip"
-        maxTimeInSeconds: 36000
-        maxTimeBetweenOutput: 3600
-        userMessageOnFailure: "Failed to run build.py, check logs."
-    enable_if:
-      condition: and
-      conditions:
-        - condition: property
-          property: target.compiler
-          in_values: [MSVC2013, MSVC2015, MSVC2017, MSVC2019]
-        - condition: property
-          property: target.arch
-          equals_value: X86
-
   - type: UploadArtifact
     archiveDirectory: "{{.AgentWorkingDir}}/qt-creator/qt-creator_build/build"
     transferType: UploadModuleBuildArtifact

coin/instructions/common_environment.yaml

@@ -7,10 +7,10 @@ instructions:
         variableValue: "RelWithDebInfo"
       - type: EnvironmentVariable
         variableName: LLVM_BASE_URL
-        variableValue: https://ci-files02-hki.ci.qt.io/packages/jenkins/qtcreator_libclang/libclang-release_17.0.1-based
+        variableValue: https://ci-files02-hki.ci.qt.io/packages/jenkins/qtcreator_libclang/libclang-release_18.1.7-based
       - type: EnvironmentVariable
         variableName: QTC_QT_BASE_URL
-        variableValue: "https://ci-files02-hki.ci.qt.io/packages/jenkins/archive/qt/6.6/6.6.2-released/Qt"
+        variableValue: "https://ci-files02-hki.ci.qt.io/packages/jenkins/archive/qt/6.7/6.7.1-released/Qt"
       - type: EnvironmentVariable
         variableName: QTC_QT_MODULES
         variableValue: "qt5compat qtbase qtdeclarative qtimageformats qtquick3d qtquicktimeline qtserialport qtshadertools qtsvg qttools qttranslations qtwebengine"
@@ -19,10 +19,10 @@ instructions:
         variableValue: 11.0
       - type: EnvironmentVariable
         variableName: SDKTOOL_MACOSX_DEPLOYMENT_TARGET
-        variableValue: 10.14
+        variableValue: 11.0
       - type: EnvironmentVariable
         variableName: QTC_SDKTOOL_QT_BASE_URL
-        variableValue: "https://ci-files02-hki.ci.qt.io/packages/jenkins/archive/qt/5.15/5.15.2-final-released/latest/src/submodules/qtbase-everywhere-src-5.15.2"
+        variableValue: "https://ci-files02-hki.ci.qt.io/packages/jenkins/archive/qt/6.6/6.6.0-released/Qt/src/submodules/qtbase-everywhere-src-6.6.0"
       - type: Group
         instructions:
           - type: EnvironmentVariable
@@ -59,6 +59,21 @@ instructions:
           condition: property
           property: target.os
           equals_value: MacOS
+      - type: Group
+        instructions:
+          - type: EnvironmentVariable
+            variableName: QTC_SCCACHE_C_OPTION
+            variableValue: --add-config=-DCMAKE_C_COMPILER_LAUNCHER=sccache
+          - type: EnvironmentVariable
+            variableName: QTC_SCCACHE_CXX_OPTION
+            variableValue: --add-config=-DCMAKE_CXX_COMPILER_LAUNCHER=sccache
+          - type: EnvironmentVariable
+            variableName: QTC_SCCACHE_ENABLE_OPTION
+            variableValue: --add-config=-DWITH_SCCACHE_SUPPORT=ON
+        enable_if:
+          condition: property
+          property: features
+          contains_value: Sccache
 
   - type: Group
     instructions:

coin/instructions/provision.yaml

@@ -20,7 +20,7 @@ instructions:
     maxTimeInSeconds: 600
     maxTimeBetweenOutput: 600
     project: qtsdk/tqtc-qtsdk
-    ref: master
+    ref: production
     directory: "build/tqtc-qtsdk"
     userMessageOnFailure: "Failed to install tqtc-qtsdk, check logs"
   - type: Group

coin/module_config.yaml

@@ -16,6 +16,9 @@ accept_configuration:
         - condition: property
           property: target.compiler
           equals_value: MSVC2019
+        - condition: property
+          property: target.arch
+          not_equals_value: X86
     - condition: and
       conditions:
         - condition: property

coin/product_dependencies.yaml

@@ -1,4 +1,4 @@
 dependencies:
   ../../qt/qt5.git:
-    ref: "6.6"
+    ref: "6.7"
 

dist/changelog/changes-13.0.2.md

@@ -0,0 +1,94 @@
+Qt Creator 13.0.2
+=================
+
+Qt Creator version 13.0.2 contains bug fixes.
+
+The most important changes are listed in this document. For a complete list of
+changes, see the Git log for the Qt Creator sources that you can check out from
+the public Git repository. For example:
+
+    git clone git://code.qt.io/qt-creator/qt-creator.git
+    git log --cherry-pick --pretty=oneline v13.0.1..v13.0.2
+
+General
+-------
+
+* Fixed that the `-client` option could start a new Qt Creator instance instead
+  of using a running one (which affects for example version control operations)
+  ([QTCREATORBUG-30624](https://bugreports.qt.io/browse/QTCREATORBUG-30624))
+
+Editing
+-------
+
+* Fixed that closing files with the tool button didn't add an entry to the
+  navigation history
+
+### Widget Designer
+
+* Fixed that `Use Qt module name in #include-directive` used Qt 4 module names
+  ([QTCREATORBUG-30751](https://bugreports.qt.io/browse/QTCREATORBUG-30751))
+
+### Copilot
+
+* Adapted to changes in the Copilot neovim plugin
+
+Projects
+--------
+
+### CMake
+
+* Fixed the environment macro expansion for Presets
+
+### Meson
+
+* Fixed a crash when selecting kits
+  ([QTCREATORBUG-30698](https://bugreports.qt.io/browse/QTCREATORBUG-30698))
+
+Terminal
+--------
+
+* Fixed the handling of environment variables with an equal sign `=` in the
+  value
+  ([QTCREATORBUG-30844](https://bugreports.qt.io/browse/QTCREATORBUG-30844))
+
+Version Control Systems
+-----------------------
+
+### Git
+
+* Fixed a crash in `Instant Blame` when reloading externally modified files
+  ([QTCREATORBUG-30824](https://bugreports.qt.io/browse/QTCREATORBUG-30824))
+
+Platforms
+---------
+
+### Windows
+
+* Fixed missing paths with `Add build library search path to PATH` for CMake
+  projects
+  ([QTCREATORBUG-30556](https://bugreports.qt.io/browse/QTCREATORBUG-30556),
+   [QTCREATORBUG-30827](https://bugreports.qt.io/browse/QTCREATORBUG-30827),
+   [QTCREATORBUG-30932](https://bugreports.qt.io/browse/QTCREATORBUG-30932))
+
+### Android
+
+* Fixed a crash when re-connecting devices
+  ([QTCREATORBUG-30645](https://bugreports.qt.io/browse/QTCREATORBUG-30645),
+   [QTCREATORBUG-30770](https://bugreports.qt.io/browse/QTCREATORBUG-30770))
+
+### Remote Linux
+
+* Fixed passing more than one argument to `rsync`
+  ([QTCREATORBUG-30795](https://bugreports.qt.io/browse/QTCREATORBUG-30795))
+
+Credits for these changes go to:
+--------------------------------
+Alessandro Portale  
+Christian Kandeler  
+Christian Stenger  
+Cristian Adam  
+David Schulz  
+Eike Ziller  
+Leena Miettinen  
+Marcus Tillmanns  
+Robert Löhning  

dist/changelog/changes-14.0.0.md

@@ -0,0 +1,379 @@
+Qt Creator 14
+=============
+
+Qt Creator version 14 contains bug fixes and new features.
+
+The most important changes are listed in this document. For a complete list of
+changes, see the Git log for the Qt Creator sources that you can check out from
+the public Git repository or view online at
+
+<https://code.qt.io/cgit/qt-creator/qt-creator.git/log/?id=13.0..v14.0.0>
+
+General
+-------
+
+* Started work on supporting Lua based plugins (registering language servers,
+  actions, preferences, and wizards)
+  ([Documentation](https://doc-snapshots.qt.io/qtcreator-extending/lua-extensions.html))
+* Added a mode for managing extensions
+* Added `Clear` and `Save Contents` to context menus of all output views
+* Locator
+    * Added the option to show results relative to project root
+      ([QTCREATORBUG-29462](https://bugreports.qt.io/browse/QTCREATORBUG-29462))
+
+Editing
+-------
+
+* Changed the default behavior when files change on disk to
+  `Reload All Unchanged Editors`
+* Made the search options session-specific
+  ([QTCREATORBUG-793](https://bugreports.qt.io/browse/QTCREATORBUG-793))
+* Added menus with the navigation history to the back and forward buttons
+  ([QTCREATORBUG-347](https://bugreports.qt.io/browse/QTCREATORBUG-347))
+* Added a highlight for the current view in case of multiple views
+  ([QTCREATORBUG-23654](https://bugreports.qt.io/browse/QTCREATORBUG-23654))
+* Added `Window > Reopen Last Closed Document`
+* Added the option to open files in a text editor that were detected as binary
+  ([QTCREATORBUG-31116](https://bugreports.qt.io/browse/QTCREATORBUG-31116))
+* Fixed that changing a document's MIME type by renaming did not re-open it in
+  the new editor type when needed
+  ([QTCREATORBUG-30317](https://bugreports.qt.io/browse/QTCREATORBUG-30317))
+* Fixed that after hiding the editor in `Debug` mode, `Edit` mode always opened
+  when opening documents, even if an external editor window was available
+  ([QTCREATORBUG-30408](https://bugreports.qt.io/browse/QTCREATORBUG-30408))
+* Fixed that it wasn't possible to open a file in the text editor if it was
+  classified as a binary file format by the MIME database
+  ([QTCREATORBUG-31116](https://bugreports.qt.io/browse/QTCREATORBUG-31116))
+* Fixed the unindenting with backspace when multiple cursors are active
+  ([QTCREATORBUG-31158](https://bugreports.qt.io/browse/QTCREATORBUG-31158))
+
+### C++
+
+* Made C++ code model settings configurable per project
+* Added a setting for the naming of include guards
+  ([QTCREATORBUG-25117](https://bugreports.qt.io/browse/QTCREATORBUG-25117))
+* Fixed indentation after function calls with subscript operator
+  ([QTCREATORBUG-29225](https://bugreports.qt.io/browse/QTCREATORBUG-29225))
+* Refactoring
+    * Added `Convert Function Call to Qt Meta-Method Invocation`
+      ([QTCREATORBUG-15972](https://bugreports.qt.io/browse/QTCREATORBUG-15972))
+    * Added `Move Class to a Dedicated Set of Source Files`
+      ([QTCREATORBUG-12190](https://bugreports.qt.io/browse/QTCREATORBUG-12190))
+    * Added `Re-order Member Function Definitions According to Declaration Order`
+      ([QTCREATORBUG-6199](https://bugreports.qt.io/browse/QTCREATORBUG-6199))
+    * Added `Add Curly Braces` for do, while, and for loops
+    * Fixed issues with macros
+      ([QTCREATORBUG-10279](https://bugreports.qt.io/browse/QTCREATORBUG-10279))
+
+    [Documentation](https://doc.qt.io/qtcreator/creator-reference-cpp-quick-fixes.html)
+
+* Clangd
+    * Updated the prebuilt binaries to LLVM 18.1.7
+    * Increased the minimum version to LLVM 17
+    * Added the `Per-project index location` and `Per-session index location`
+      options in `Preferences` > `C++` > `Clangd` for setting the index location
+      for a project or session
+      ([QTCREATORBUG-27346](https://bugreports.qt.io/browse/QTCREATORBUG-27346))
+    * Added the `Update dependent sources` option to make re-parsing source files
+      while editing header files optional
+      ([QTCREATORBUG-29943](https://bugreports.qt.io/browse/QTCREATORBUG-29943))
+    * Fixed the handling of system headers
+      ([QTCREATORBUG-30474](https://bugreports.qt.io/browse/QTCREATORBUG-30474))
+* Built-in
+    * Added the `Enable indexing` option in `Preferences` > `C++` > `Code Model`
+      to turn off the built-in indexer
+      ([QTCREATORBUG-29147](https://bugreports.qt.io/browse/QTCREATORBUG-29147))
+    * Added the `Statement Macros` field in `Preferences` > `C++` > `Code Style`
+      for macros that the indenter interprets as complete statements that don't
+      require a semicolon at the end
+      ([QTCREATORBUG-13640](https://bugreports.qt.io/browse/QTCREATORBUG-13640),
+       [QTCREATORBUG-15069](https://bugreports.qt.io/browse/QTCREATORBUG-15069),
+       [QTCREATORBUG-18789](https://bugreports.qt.io/browse/QTCREATORBUG-18789))
+      ([Clang Format Documentation](https://clang.llvm.org/docs/ClangFormatStyleOptions.html#statementmacros))
+    * Added indentation support for `try-catch` statements
+      ([QTCREATORBUG-29452](https://bugreports.qt.io/browse/QTCREATORBUG-29452))
+
+### QML
+
+* Improved support for enums
+  ([QTCREATORBUG-19226](https://bugreports.qt.io/browse/QTCREATORBUG-19226))
+* Added `Qt Design Studio` to `Open With` for `.ui.qml` files
+  ([Documentation](https://doc.qt.io/qtcreator/creator-quick-ui-forms.html))
+* Fixed that the color preview did not work on named colors
+  ([QTCREATORBUG-30594](https://bugreports.qt.io/browse/QTCREATORBUG-30594))
+* Language Server
+    * Switched on by default for Qt 6.8 and later
+    * Added an option for generating `qmlls.ini` files for CMake projects in
+      `Preferences` > `Qt Quick`> `QML/JS Editing`
+      ([QTCREATORBUG-30394](https://bugreports.qt.io/browse/QTCREATORBUG-30394))
+      ([Qt Documentation](https://doc.qt.io/qt-6/cmake-variable-qt-qml-generate-qmlls-ini.html))
+    * Fixed that tool tips from the built-in model were shown instead of tool tips
+      from the server
+
+      [Documentation](https://doc.qt.io/qtcreator/creator-how-to-use-qml-language-server.html)
+
+### Python
+
+* Added options for updating Python Language Server
+  ([Documentation](https://doc-snapshots.qt.io/qtcreator-14.0/creator-language-servers.html))
+
+### Language Server Protocol
+
+* Added support for `SymbolTag`
+  ([Protocol Documentation](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#symbolTag))
+* Added support for type hierarchy
+  ([QTCREATORBUG-28116](https://bugreports.qt.io/browse/QTCREATORBUG-28116))
+
+### Compiler Explorer
+
+* Added a wizard template for code that uses Qt to `File`> `New File`>
+  `Compiler Explorer`
+  [Documentation](https://doc.qt.io/qtcreator/creator-how-to-create-compiler-explorer-sessions.html)
+
+### Markdown
+
+* Fixed the navigation history
+
+### Models
+
+* Added more visual attributes for relations
+* Added support for linked files in model element properties
+* Added support for custom images in model element properties
+
+([Documentation](https://doc-snapshots.qt.io/qtcreator-14.0/creator-how-to-create-models.html))
+
+### SCXML
+
+* Added visualization of conditions on transitions by using square brackets: `[]`
+  ([QTCREATORBUG-21946](https://bugreports.qt.io/browse/QTCREATORBUG-21946))
+  ([Documentation](https://doc-snapshots.qt.io/qtcreator-14.0/creator-scxml.html))
+
+Projects
+--------
+
+* Added the `Hide Inactive Kits`/`Show All Kits` button to hide inactive kits
+  from the list in the `Projects` mode
+* Added support for user comments in the environment editor
+  ([Documentation](https://doc-snapshots.qt.io/qtcreator-14.0/creator-how-to-edit-environment-settings.html))
+* Added the setting `Time to wait before force-stopping applications`
+  ([QTCREATORBUG-31025](https://bugreports.qt.io/browse/QTCREATORBUG-31025))
+* Fixed the parsing of file links when color was used for the output
+  ([QTCREATORBUG-30774](https://bugreports.qt.io/browse/QTCREATORBUG-30774))
+* Fixed that the column information was not used when opening files from links
+  in issues
+* Fixed changing the case of file names on case-insensitive file systems
+  ([QTCREATORBUG-30846](https://bugreports.qt.io/browse/QTCREATORBUG-30846))
+* Fixed that Qt Creator variables were not expanded for the `Copy File`
+  deploy step
+  ([QTCREATORBUG-30821](https://bugreports.qt.io/browse/QTCREATORBUG-30821))
+* Fixed duplicate entries in the variable chooser for the build directory
+  ([QTCREATORBUG-31183](https://bugreports.qt.io/browse/QTCREATORBUG-31183))
+
+### CMake
+
+* Made CMake settings configurable per project
+* Implemented `Open Online Documentation` for CMake documentation
+* Added `Clear CMake Configuration` to the context menu in the `Projects` view
+  ([QTCREATORBUG-24658](https://bugreports.qt.io/browse/QTCREATORBUG-24658))
+* Added support for the `CROSSCOMPILING_EMULATOR` target property
+  ([QTCREATORBUG-29880](https://bugreports.qt.io/browse/QTCREATORBUG-29880))
+  ([CMake Documentation](https://cmake.org/cmake/help/latest/prop_tgt/CROSSCOMPILING_EMULATOR.html#crosscompiling-emulator))
+* Fixed that the package manager auto-setup files were not removed with
+  `Clear CMake Configuration`
+  ([QTCREATORBUG-30771](https://bugreports.qt.io/browse/QTCREATORBUG-30771))
+* Fixed that files generated by the Qt QML CMake API were not filtered as
+  generated files
+  ([QTCREATORBUG-29631](https://bugreports.qt.io/browse/QTCREATORBUG-29631))
+* Fixed a crash when triggering `Follow Symbol` in a CMake file that does not
+  belong to a project
+  ([QTCREATORBUG-31077](https://bugreports.qt.io/browse/QTCREATORBUG-31077))
+* Fixed that multiple build configurations of the same type used the same
+  build directory
+  ([QTCREATORBUG-26066](https://bugreports.qt.io/browse/QTCREATORBUG-26066))
+* Fixed an issue with adding new files when file globs are used in the CMake
+  files
+  ([QTCREATORBUG-30445](https://bugreports.qt.io/browse/QTCREATORBUG-30445))
+* Fixed the default CMake generator for kits if Ninja is not installed
+  ([QTCREATORBUG-31129](https://bugreports.qt.io/browse/QTCREATORBUG-31129))
+* Fixed that duplicate `CMAKE_CXX_COMPILER` entries could be used
+  ([QTCREATORBUG-27005](https://bugreports.qt.io/browse/QTCREATORBUG-27005))
+* Presets
+    * Made CMake settings configurable
+      ([QTCREATORBUG-25972](https://bugreports.qt.io/browse/QTCREATORBUG-25972),
+       [QTCREATORBUG-29559](https://bugreports.qt.io/browse/QTCREATORBUG-29559),
+       [QTCREATORBUG-30385](https://bugreports.qt.io/browse/QTCREATORBUG-30385))
+    * Made it possible to register debuggers
+      ([QTCREATORBUG-30836](https://bugreports.qt.io/browse/QTCREATORBUG-30836))
+    * Added support for custom build types
+      ([QTCREATORBUG-30014](https://bugreports.qt.io/browse/QTCREATORBUG-30014))
+
+    ([Documentation](https://doc-snapshots.qt.io/qtcreator-14.0/creator-build-settings-cmake-presets.html))
+
+### Workspace
+
+* Added `File > Open Workspace` for opening a directory as a project. A project
+  file `.qtcreator/project.json` in the directory is used to set a name and
+  file exclusion filters.
+
+Debugging
+---------
+
+### C++
+
+* Improved performance
+* GDB
+    * Added a setting for `debuginfod`
+      ([QTCREATORBUG-28868](https://bugreports.qt.io/browse/QTCREATORBUG-28868))
+* CDB
+    * Fixed the display type of `HRESULT`
+      ([QTCREATORBUG-30574](https://bugreports.qt.io/browse/QTCREATORBUG-30574))
+
+Analyzer
+--------
+
+### Clang
+
+* Added the option to `Suppress Diagnostics Inline`
+  ([QTCREATORBUG-24847](https://bugreports.qt.io/browse/QTCREATORBUG-24847))
+  ([Clazy Documentation](https://github.com/KDE/clazy?tab=readme-ov-file#reducing-warning-noise))
+  ([clang-tidy Documentation](https://clang.llvm.org/extra/clang-tidy/#suppressing-undesired-diagnostics))
+
+### Axivion
+
+* Added the `Add` and `Remove` buttons to `Preferences` > `Axivion` for
+  registering multiple servers
+  ([Documentation](https://doc-snapshots.qt.io/qtcreator-14.0/creator-preferences-axivion.html))
+
+### Cppcheck
+
+* Fixed that Cppcheck was not working until selecting `Apply` in the settings
+  ([QTCREATORBUG-28951](https://bugreports.qt.io/browse/QTCREATORBUG-28951),
+   [QTCREATORBUG-30615](https://bugreports.qt.io/browse/QTCREATORBUG-30615))
+
+Terminal
+--------
+
+* Fixed resizing on Windows
+  ([QTCREATORBUG-30558](https://bugreports.qt.io/browse/QTCREATORBUG-30558))
+
+Version Control Systems
+-----------------------
+
+### Git
+
+* Fixed that email and author mapping was not used for logs and showing changes
+
+Test Integration
+----------------
+
+* Made the test timeout optional in `Preferences` > `Testing` > `General`
+  ([QTCREATORBUG-30668](https://bugreports.qt.io/browse/QTCREATORBUG-30668))
+  ([Documentation](https://doc-snapshots.qt.io/qtcreator-14.0/creator-preferences-testing.html))
+* Added the project specific `Limit Files to Path Patterns` option in `Projects` >
+  `Project Settings` > `Testing` for restricting the search for tests
+  ([Documentation](https://doc-snapshots.qt.io/qtcreator-14.0/creator-how-to-limit-files-to-path-patterns.html))
+
+### Qt Test
+
+* Fixed the order of test execution
+  ([QTCREATORBUG-30670](https://bugreports.qt.io/browse/QTCREATORBUG-30670))
+
+Platforms
+---------
+
+### Linux
+
+* Adapted the default theme to the system theme
+* Fixed issues with light themes on dark system themes
+  ([QTCREATORBUG-18281](https://bugreports.qt.io/browse/QTCREATORBUG-18281),
+   [QTCREATORBUG-20889](https://bugreports.qt.io/browse/QTCREATORBUG-20889),
+   [QTCREATORBUG-26817](https://bugreports.qt.io/browse/QTCREATORBUG-26817),
+   [QTCREATORBUG-28589](https://bugreports.qt.io/browse/QTCREATORBUG-28589),
+   [QTCREATORBUG-30138](https://bugreports.qt.io/browse/QTCREATORBUG-30138))
+* Fixed that recent projects on unavailable remote devices regularly
+  froze Qt Creator
+  ([QTCREATORBUG-30681](https://bugreports.qt.io/browse/QTCREATORBUG-30681))
+
+### Android
+
+* Added support for creating `android-desktop` devices in `Preferences` >
+  `Devices` > `Add` > `Android Device` > `Device definition`
+* Added support for `namespace` in `build.gradle`
+  ([QTBUG-106907](https://bugreports.qt.io/browse/QTBUG-106907))
+* Fixed that errors when creating AVDs were not visible to the user
+  ([QTCREATORBUG-30852](https://bugreports.qt.io/browse/QTCREATORBUG-30852))
+
+### iOS
+
+* Removed Simulator management from the preferences. Use the
+  `Devices and Simulators` window in Xcode instead.
+* Fixed that starting the debugger could be slow for iOS < 17
+  ([QTCREATORBUG-31044](https://bugreports.qt.io/browse/QTCREATORBUG-31044))
+
+### Remote Linux
+
+* Added the `Use SSH port forwarding for debugging` option in `Preferences` >
+  `Devices` for a `Remote Linux Device`
+* Improved the performance of the generic deployment method
+* Fixed that the file size check that is performed before parsing C++ files
+  could freeze Qt Creator until finished for remote projects
+
+### Qt Application Manager
+
+* Added support for the `perf` profiler
+
+### Bare Metal
+
+* Fixed issues with Qbs and the IAR toolchain
+  ([QTCREATORBUG-24040](https://bugreports.qt.io/browse/QTCREATORBUG-24040))
+
+Credits for these changes go to:
+--------------------------------
+Ahmad Samir  
+Aleksei German  
+Alessandro Portale  
+Alexander Drozdov  
+Ali Kianian  
+Andre Hartmann  
+André Pönitz  
+Artem Sokolovskii  
+Assam Boudjelthia  
+BogDan Vatra  
+Brook Cronin  
+Burak Hancerli  
+Christian Kandeler  
+Christian Stenger  
+Cristian Adam  
+David Schulz  
+Dominik Holland  
+Eike Ziller  
+Esa Törmänen  
+Henning Gruendl  
+Jaroslaw Kobus  
+Jiajie Chen  
+Jochen Becher  
+Johanna Vanhatapio  
+Jussi Witick  
+Knud Dollereder  
+Leena Miettinen  
+Mahmoud Badri  
+Marco Bubke  
+Marcus Tillmanns  
+Mathias Hasselmann  
+Mats Honkamaa  
+Michael Weghorn  
+Miikka Heikkinen  
+Orgad Shaneh  
+Pranta Dastider  
+Ralf Habacker  
+Robert Löhning  
+Sami Shalayel  
+Semih Yavuz  
+Sergey Silin  
+Shrief Gabr  
+Teea Poldsam  
+Thiago Macieira  
+Thomas Hartmann  
+Tim Jenßen  
+Vikas Pachdha  
+Xavier Besson  

dist/changelog/template.md

@@ -0,0 +1,135 @@
+Qt Creator 13
+=============
+
+Qt Creator version 13 contains bug fixes and new features.
+
+The most important changes are listed in this document. For a complete list of
+changes, see the Git log for the Qt Creator sources that you can check out from
+the public Git repository. For example:
+
+    git clone git://code.qt.io/qt-creator/qt-creator.git
+    git log --cherry-pick --pretty=oneline origin/12.0..v13.0.0
+
+New plugins
+-----------
+
+General
+-------
+
+Help
+----
+
+Editing
+-------
+
+### C++
+
+### QML
+
+### Python
+
+### Language Server Protocol
+
+### Widget Designer
+
+### Copilot
+
+### Compiler Explorer
+
+### TODO
+
+### Markdown
+
+### Images
+
+### Models
+
+### SCXML
+
+### Binary Files
+
+Projects
+--------
+
+### CMake
+
+### qmake
+
+### Qbs
+
+### Python
+
+### Workspace
+
+### vcpkg
+
+### Qt Safe Renderer
+
+Debugging
+---------
+
+### C++
+
+### QML
+
+### Debug Adapter Protocol
+
+Analyzer
+--------
+
+### Clang
+
+### Axivion
+
+### CTF Visualizer
+
+### Cppcheck
+
+Terminal
+--------
+
+Version Control Systems
+-----------------------
+
+### Git
+
+### CVS
+
+Test Integration
+----------------
+
+### Qt Test
+
+### Catch2
+
+### CTest
+
+Platforms
+---------
+
+### Windows
+
+### Linux
+
+### macOS
+
+### Android
+
+### iOS
+
+### Remote Linux
+
+### Docker
+
+### Boot to Qt
+
+### MCU
+
+### Qt Application Manager
+
+### QNX
+
+### Bare Metal
+
+Credits for these changes go to:
+--------------------------------

dist/copyright_template.txt

@@ -1,3 +1,3 @@
-// Copyright (C) 2023 The Qt Company Ltd.
+// Copyright (C) %{CurrentDate:yyyy} The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 

doc/CMakeLists.txt

@@ -25,11 +25,19 @@ function(_find_all_includes _ret_includes _ret_framework_paths)
 
   # framework path
   if (APPLE)
+    get_target_property(_qt_type Qt::Core TYPE)
+    if ("${_qt_type}" STREQUAL "INTERFACE_LIBRARY")
         # version-less target Qt::Core is an interface library that links to QtX::Core
         get_target_property(_qt_core Qt::Core INTERFACE_LINK_LIBRARIES)
-    get_target_property(_qt_target ${_qt_core} LOCATION) # <fw_path>/QtCore.framework/QtCore
-    get_filename_component(_qt_loc "${_qt_target}" DIRECTORY)
-    set("${_ret_framework_paths}" "${_qt_loc}/.." PARENT_SCOPE)
+    else()
+        set(_qt_core "Qt::Core")
+    endif()
+    get_target_property(_qt_target ${_qt_core} LOCATION)
+    # eg <fw_path>/QtCore.framework/QtCore
+    # or <fw_path>/QtCore.framework/Versions/A/QtCore
+    # cut off /QtCore.framework/*
+    string(REGEX REPLACE "/QtCore.framework/.*" "" _qt_loc "${_qt_target}")
+    set("${_ret_framework_paths}" "${_qt_loc}" PARENT_SCOPE)
   endif()
 endfunction()
 
@@ -67,8 +75,14 @@ if(WITH_ONLINE_DOCS)
   _add_doc(${IDE_DOC_FILE_ONLINE} "qtcreatordev/qtcreator-dev-online.qdocconf")
 endif()
 
+if (BUILD_DOCS_BY_DEFAULT)
+set(EXCLUDE_DOCS_FROM_ALL "")
+else()
+set(EXCLUDE_DOCS_FROM_ALL "EXCLUDE_FROM_ALL")
+endif()
+
 install(DIRECTORY config
   DESTINATION ${IDE_HEADER_INSTALL_PATH}/doc
   COMPONENT Devel
-  EXCLUDE_FROM_ALL
+  ${EXCLUDE_DOCS_FROM_ALL}
 )

doc/config/macros.qdocconf

@@ -16,6 +16,7 @@ macro.macos             = "macOS"
 macro.note              = "\\b{Note:}"
 macro.oslash.HTML       = "ø"
 macro.ouml.HTML         = "ö"
+macro.B2Q               = "Boot to Qt"
 macro.Q3DS              = "Qt 3D Studio"
 macro.QA                = "Qt Assistant"
 macro.QAC               = "Qt Academy"
@@ -26,7 +27,7 @@ macro.QBSK              = "Qt Bridge for Sketch"
 macro.QBF               = "Qt Bridge for Figma"
 macro.QC                = "$IDE_DISPLAY_NAME"
 macro.QCE               = "$IDE_DISPLAY_NAME Enterprise"
-macro.QD                = "Qt Designer"
+macro.QD                = "Qt Widgets Designer"
 macro.QDS               = "Qt Design Studio"
 macro.QQEM              = "Qt Quick Effect Maker"
 macro.QDV               = "Qt Design Viewer"

doc/qtcreator/config/qtcreator-project.qdocconf

@@ -1,5 +1,5 @@
 project     = qtcreator
-description = "$IDE_DISPLAY_NAME Manual"
+description = "$IDE_DISPLAY_NAME Documentation"
 url         = http://doc.qt.io/$IDE_ID
 
 #Words to ignore for auto-linking
@@ -57,14 +57,14 @@ qhp.projects            = QtCreator
 qhp.QtCreator.file             = qtcreator.qhp
 qhp.QtCreator.namespace        = org.qt-project.qtcreator.$QTC_VERSION_TAG
 qhp.QtCreator.virtualFolder    = doc
-qhp.QtCreator.indexTitle       = $IDE_DISPLAY_NAME Manual $QTC_VERSION
+qhp.QtCreator.indexTitle       = $IDE_DISPLAY_NAME Documentation $QTC_VERSION
 qhp.QtCreator.filterAttributes = $IDE_ID $QTC_VERSION
 qhp.QtCreator.customFilters.QtCreator.name = $IDE_DISPLAY_NAME $QTC_VERSION
 qhp.QtCreator.customFilters.QtCreator.filterAttributes = $IDE_ID $QTC_VERSION
 qhp.QtCreator.indexRoot        =
 
 qhp.QtCreator.subprojects = manual
-qhp.QtCreator.subprojects.manual.title = $IDE_DISPLAY_NAME Manual
+qhp.QtCreator.subprojects.manual.title = $IDE_DISPLAY_NAME Documentation
 qhp.QtCreator.subprojects.manual.indexTitle = All Topics
 qhp.QtCreator.subprojects.manual.type = manual
 
@@ -73,10 +73,10 @@ qhp.QtCreator.subprojects.manual.type = manual
 macro.see                       = "\\sa"
 macro.function                  = "\\fn"
 
-navigation.landingpage = "$IDE_DISPLAY_NAME Manual"
+navigation.landingpage = "$IDE_DISPLAY_NAME Documentation"
 
 # Auto-generate navigation linking based on "All Topics":
 navigation.toctitles = "All Topics"
 navigation.toctitles.inclusive = false
 
-buildversion = "$IDE_DISPLAY_NAME Manual $QTC_VERSION"
+buildversion = "$IDE_DISPLAY_NAME $QTC_VERSION"

doc/qtcreator/config/style/qt5-sidebar.html

@@ -1,24 +1,26 @@
 <div class="sectionlist normallist">
     <ul>
-            <li><a href="qtcreator-toc.html">Click Here for a List of All Topics</a></li>
+            <li><a href="qtcreator-toc.html">ALL TOPICS</a></li>
+    </ul>
+</div>
+<div class="sectionlist normallist">
+    <ul>
+            <li><a href="creator-how-to-install.html">Installation</a></li>
     </ul>
 </div>
 <div class="sectionlist normallist">
     <div class="heading">
-        <h2>Developing with Qt Creator</h2>
+        <h2>Getting Started</h2>
     </div>
     <div class="indexboxcont indexboxbar">
         <ul>
             <li><a href="creator-overview.html">Overview</a></li>
-            <li><a href="creator-getting-started.html">Getting Started</a></li>
+            <li><a href="creator-quick-tour.html">User Interface</a></li>
+            <li><a href="creator-configuring.html">Configuring Qt Creator</a></li>
             <li><a href="creator-project-creating.html">Creating Projects</a></li>
             <li><a href="creator-configuring-projects.html">Configuring Projects</a></li>
-            <li><a href="creator-live-preview.html">Validating with Target Hardware</a></li>
-            <li><a href="creator-connecting-mobile.html">Connecting Devices</a></li>
-            <li><a href="creator-deployment.html">Deploying to Devices</a></li>
             <li><a href="creator-debugging.html">Debugging</a></li>
             <li><a href="creator-analyze-mode.html">Analyzing Code</a></li>
-            <li><a href="creator-squish.html">Using Squish</a></li>
         </ul>
     </div>
 </div>
@@ -77,12 +79,12 @@
         <li><a href="technical-support.html">Technical Support</a></li>
         <li><a href="creator-version-control.html">Version Control Systems</a></li>
         <li><a href="creator-reference.html#analyzers">Analyzers</a></li>
-        <li><a href="creator-reference.html#build-configurations">Build Configurations</a></li>
         <li><a href="creator-reference.html#build-systems">Build Systems</a></li>
+        <li><a href="creator-reference.html#debuggers">Debuggers</a></li>
+        <li><a href="creator-reference.html#devices">Devices</a></li>
         <li><a href="creator-reference.html#editors">Editors</a></li>
         <li><a href="creator-reference.html#platforms">Platforms</a></li>
         <li><a href="creator-reference.html#preferences">Preferences</a></li>
-        <li><a href="creator-reference.html#run-configurations">Run Configurations</a></li>
         <li><a href="creator-reference.html#ui-design">UI Design</a></li>
         <li><a href="creator-reference.html#views">Views</a></li>
         <li><a href="creator-reference.html">See All</a></li>

doc/qtcreator/examples/textfinder/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.16)
 
 project(TextFinder VERSION 0.1 LANGUAGES CXX)