mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-05-21 21:11:29 +00:00
Code Issues Releases Wiki Activity

Upgrade Qt to 6.6.3

Browse source
This commit is contained in:
Andrei Kortunov 2024-06-13 17:55:46 +04:00
parent b001deeff7
commit 819ba42be2
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitlab-ci.yml
View file

@ -606,7 +606,7 @@ macOS14_Xcode15_arm64:
- Get-Volume - Get-Volume
- Copy-Item C:\ProgramData\chocolatey\logs\chocolatey.log - Copy-Item C:\ProgramData\chocolatey\logs\chocolatey.log
cache: cache:
key: ninja-2022-v9 key: ninja-2022-v10
paths: paths:
- ccache - ccache
- deps - deps
@ -716,7 +716,7 @@ macOS14_Xcode15_arm64:
- Get-Volume - Get-Volume
- Copy-Item C:\ProgramData\chocolatey\logs\chocolatey.log - Copy-Item C:\ProgramData\chocolatey\logs\chocolatey.log
cache: cache:
key: msbuild-2022-v9 key: msbuild-2022-v10
paths: paths:
- deps - deps
- MSVC2022_64/deps/Qt - MSVC2022_64/deps/Qt

4
CI/before_script.msvc.sh
View file

@ -573,7 +573,7 @@ ICU_VER="70_1"
LUAJIT_VER="v2.1.0-beta3-452-g7a0cf5fd" LUAJIT_VER="v2.1.0-beta3-452-g7a0cf5fd"
LZ4_VER="1.9.2" LZ4_VER="1.9.2"
OPENAL_VER="1.23.0" OPENAL_VER="1.23.0"
QT_VER="6.6.2" QT_VER="6.6.3"
OSG_ARCHIVE_NAME="OSGoS 3.6.5" OSG_ARCHIVE_NAME="OSGoS 3.6.5"
OSG_ARCHIVE="OSGoS-3.6.5-123-g68c5c573d-msvc${OSG_MSVC_YEAR}-win${BITS}" OSG_ARCHIVE="OSGoS-3.6.5-123-g68c5c573d-msvc${OSG_MSVC_YEAR}-win${BITS}"
@ -904,7 +904,7 @@ printf "Qt ${QT_VER}... "
printf "Exists. " printf "Exists. "
elif [ -z $SKIP_EXTRACT ]; then elif [ -z $SKIP_EXTRACT ]; then
pushd "$DEPS" > /dev/null pushd "$DEPS" > /dev/null
AQT_VERSION="v3.1.12" AQT_VERSION="v3.1.15"
if ! [ -f "aqt_x64-${AQT_VERSION}.exe" ]; then if ! [ -f "aqt_x64-${AQT_VERSION}.exe" ]; then
download "aqt ${AQT_VERSION}"\ download "aqt ${AQT_VERSION}"\
"https://github.com/miurahr/aqtinstall/releases/download/${AQT_VERSION}/aqt_x64.exe" \ "https://github.com/miurahr/aqtinstall/releases/download/${AQT_VERSION}/aqt_x64.exe" \