diff options
| author | doufu <doufu3344@gmail.com> | 2023-09-06 03:22:27 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-09-07 13:03:25 (GMT) |
| commit | 7def566e92283e896a9c266f0b9b9b0afabad75e (patch) | |
| tree | 14c2aee62f9d898ef37e8bc69042335639c8cb59 /.gitlab | |
| parent | 98e1bea3fa9eb303ec38d6c515bd6a75f725083e (diff) | |
| download | CMake-7def566e92283e896a9c266f0b9b9b0afabad75e.zip CMake-7def566e92283e896a9c266f0b9b9b0afabad75e.tar.gz CMake-7def566e92283e896a9c266f0b9b9b0afabad75e.tar.bz2 | |
Utilities/Release: Update to Qt 5.15.10 on windows-{x86_64,i386} builds
Fixes: #25187
Co-authored-by: Brad King <brad.king@kitware.com>
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/download_qt.cmake | 8 | ||||
| -rw-r--r-- | .gitlab/ci/download_qt_hashes.cmake | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab/ci/download_qt.cmake b/.gitlab/ci/download_qt.cmake index b02ceb0..28a3e27 100644 --- a/.gitlab/ci/download_qt.cmake +++ b/.gitlab/ci/download_qt.cmake @@ -15,11 +15,11 @@ if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "windows.*package") set(qt_url_root "https://cmake.org/files/dependencies") set(qt_url_path "") if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "windows_x86_64_package") - list(APPEND qt_files "qt-5.12.1-win-x86_64-msvc_v142-1.zip") - set(qt_subdir "qt-5.12.1-win-x86_64-msvc_v142-1") + list(APPEND qt_files "qt-5.15.10-win-x86_64-msvc_v142-1.zip") + set(qt_subdir "qt-5.15.10-win-x86_64-msvc_v142-1") elseif ("$ENV{CMAKE_CONFIGURATION}" MATCHES "windows_i386_package") - list(APPEND qt_files "qt-5.12.1-win-i386-msvc_v142-1.zip") - set(qt_subdir "qt-5.12.1-win-i386-msvc_v142-1") + list(APPEND qt_files "qt-5.15.10-win-i386-msvc_v142-1.zip") + set(qt_subdir "qt-5.15.10-win-i386-msvc_v142-1") elseif ("$ENV{CMAKE_CONFIGURATION}" MATCHES "windows_arm64_package") list(APPEND qt_files "qt-6.3.0-win-arm64-msvc_v143-1.zip") set(qt_subdir "qt-6.3.0-win-arm64-msvc_v143-1") diff --git a/.gitlab/ci/download_qt_hashes.cmake b/.gitlab/ci/download_qt_hashes.cmake index 4c48a47..1b9cf14 100644 --- a/.gitlab/ci/download_qt_hashes.cmake +++ b/.gitlab/ci/download_qt_hashes.cmake @@ -13,8 +13,8 @@ set("5.15.1-0-202009071110qtbase-MacOS-MacOS_10_13-Clang-MacOS-MacOS_10_13-X86_6 set("qt-5.9.9-macosx10.10-x86_64-arm64.tar.xz_hash" d4449771afa0bc6a809c14f1e6d939e7732494cf059503ae451e2bfe8fc60cc1) set("qt-5.15.2-macosx10.13-x86_64-arm64.tar.xz_hash" 7b9463a01c8beeee5bf8d01c70deff2d08561cd20aaf6f7a2f41cf8b68ce8a6b) -set("qt-5.12.1-win-i386-msvc_v142-1.zip_hash" aa78711fdaa5d9b146bf7ddcf15983f9fbb3f995462f2d043f8cca74b40ddd11) -set("qt-5.12.1-win-x86_64-msvc_v142-1.zip_hash" c2fc068b9dac40bb420e28e1ee15ce4f2ccfc866d767f3b99b6bb435b7c4f44b) +set("qt-5.15.10-win-i386-msvc_v142-1.zip_hash" c158cebc054d3f4f09733772a8a04789e2884912d45782e8c0c5e6a0b2773e92) +set("qt-5.15.10-win-x86_64-msvc_v142-1.zip_hash" d55c017aef359f6aa8c592b18ba13cc120c749417b55671548970690126cd139) set("qt-6.3.0-win-arm64-msvc_v143-1.zip_hash" f794c035fd4ff9f04468e1787a60d93d7496119c0060c3173a76d24a6b551b14) set("qt-6.3.0-win-i386-msvc_v143-1.zip_hash" 972bc707f78d11b44f360643ca4d0c898e761f7add43b96117d958c70d84a443) |