diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2022-02-08 13:33:28 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2022-02-08 13:35:29 +0100 |
| commit | d68b17e7eaabdf45985fc8245ca7a04218440aaf (patch) | |
| tree | 7f0c3bb00c26393d6a6de93c11c0bfe42b8ca32e | |
| parent | 02804556234e88866ac174fc8ea4b91f8b35ac5a (diff) | |
| parent | 1eb9263e315107fdd977c085282c6b8e2e41d691 (diff) | |
Merge remote-tracking branch 'origin/6.0' into 7.0
Change-Id: I160768d755ab444e5bab868d72fc9f403ea63169
| -rw-r--r-- | .github/workflows/build_cmake.yml | 35 | ||||
| -rw-r--r-- | doc/config/fossil.qdocconf | 2 |
2 files changed, 22 insertions, 15 deletions
diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml index 77d5d8e..23e2751 100644 --- a/.github/workflows/build_cmake.yml +++ b/.github/workflows/build_cmake.yml @@ -4,9 +4,9 @@ on: [push] env: PLUGIN_NAME: Fossil - QT_VERSION: 5.15.2 - QT_CREATOR_VERSION: 5.0.0-rc1 - QT_CREATOR_SNAPSHOT: latest + QT_VERSION: 6.2.1 + QT_CREATOR_VERSION: 6.0.0 + QT_CREATOR_SNAPSHOT: NO CMAKE_VERSION: 3.21.1 NINJA_VERSION: 1.10.2 @@ -35,7 +35,7 @@ jobs: } steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Download Ninja and CMake shell: cmake -P {0} @@ -112,37 +112,44 @@ jobs: set(url_os "linux_x64") set(qt_package_arch_suffix "gcc_64") set(qt_dir_prefix "${qt_version}/gcc_64") - set(qt_package_suffix "-Linux-RHEL_7_6-GCC-Linux-RHEL_7_6-X86_64") + set(qt_package_suffix "-Linux-RHEL_8_2-GCC-Linux-RHEL_8_2-X86_64") elseif ("${{ runner.os }}" STREQUAL "macOS") set(url_os "mac_x64") set(qt_package_arch_suffix "clang_64") - set(qt_dir_prefix "${qt_version}/clang_64") - set(qt_package_suffix "-MacOS-MacOS_10_13-Clang-MacOS-MacOS_10_13-X86_64") + set(qt_dir_prefix "${qt_version}/macos") + set(qt_package_suffix "-MacOS-MacOS_11_00-Clang-MacOS-MacOS_11_00-X86_64-ARM64") endif() - set(qt_base_url "https://download.qt.io/online/qtsdkrepository/${url_os}/desktop/qt5_${qt_version_dotless}") + set(qt_base_url "https://download.qt.io/online/qtsdkrepository/${url_os}/desktop/qt6_${qt_version_dotless}") file(DOWNLOAD "${qt_base_url}/Updates.xml" ./Updates.xml SHOW_PROGRESS) file(READ ./Updates.xml updates_xml) - string(REGEX MATCH "<Name>qt.qt5.*<Version>([0-9+-.]+)</Version>" updates_xml_output "${updates_xml}") + string(REGEX MATCH "<Name>qt.qt6.*<Version>([0-9+-.]+)</Version>" updates_xml_output "${updates_xml}") set(qt_package_version ${CMAKE_MATCH_1}) - file(MAKE_DIRECTORY qt5) + file(MAKE_DIRECTORY qt) # Save the path for other steps - file(TO_CMAKE_PATH "$ENV{GITHUB_WORKSPACE}/qt5/${qt_dir_prefix}" qt_dir) + file(TO_CMAKE_PATH "$ENV{GITHUB_WORKSPACE}/qt/${qt_dir_prefix}" qt_dir) message("::set-output name=qt_dir::${qt_dir}") message("Downloading Qt to ${qt_dir}") function(downloadAndExtract url archive) message("Downloading ${url}") file(DOWNLOAD "${url}" ./${archive} SHOW_PROGRESS) - execute_process(COMMAND ${CMAKE_COMMAND} -E tar xvf ../${archive} WORKING_DIRECTORY qt5) + execute_process(COMMAND ${CMAKE_COMMAND} -E tar xvf ../${archive} WORKING_DIRECTORY qt) endfunction() foreach(package qtbase qtdeclarative) downloadAndExtract( - "${qt_base_url}/qt.qt5.${qt_version_dotless}.${qt_package_arch_suffix}/${qt_package_version}${package}${qt_package_suffix}.7z" + "${qt_base_url}/qt.qt6.${qt_version_dotless}.${qt_package_arch_suffix}/${qt_package_version}${package}${qt_package_suffix}.7z" + ${package}.7z + ) + endforeach() + + foreach(package qt5compat qtshadertools) + downloadAndExtract( + "${qt_base_url}/qt.qt6.${qt_version_dotless}.${package}.${qt_package_arch_suffix}/${qt_package_version}${package}${qt_package_suffix}.7z" ${package}.7z ) endforeach() @@ -150,7 +157,7 @@ jobs: # uic depends on libicu56.so if ("${{ runner.os }}" STREQUAL "Linux") downloadAndExtract( - "${qt_base_url}/qt.qt5.${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-Rhel7.2-x64.7z" icu.7z ) endif() diff --git a/doc/config/fossil.qdocconf b/doc/config/fossil.qdocconf index 290023f..98433df 100644 --- a/doc/config/fossil.qdocconf +++ b/doc/config/fossil.qdocconf @@ -10,7 +10,7 @@ include($$QTC_DOCS_DIR/config/qt-defines.qdocconf) sources.fileextensions = "*.qdoc" -depends += qt-creator +depends += qtcreator qhp.projects = fossil qhp.fossil.file = fossil.qhp |