* Qt15: replace deprecated stuff

* Use Qt 5.15.1

* Move windows to Qt 5.15.2

* Move Ubuntu to Qt 5.15.2
This commit is contained in:
Megamouse
2020-12-08 22:22:08 +01:00
committed by GitHub
parent 062c605eb1
commit a7e5c255b4
5 changed files with 42 additions and 49 deletions
+7 -5
View File
@@ -33,13 +33,13 @@ jobs:
displayName: ccache
- bash: |
docker pull --quiet rpcs3/rpcs3-travis-xenial:1.6
docker pull --quiet rpcs3/rpcs3-travis-xenial:1.7
docker run \
-v $(pwd):/rpcs3 \
--env-file .ci/docker.env \
-v $CCACHE_DIR:/root/.ccache \
-v $BUILD_ARTIFACTSTAGINGDIRECTORY:/root/artifacts \
rpcs3/rpcs3-travis-xenial:1.6 \
rpcs3/rpcs3-travis-xenial:1.7 \
/rpcs3/.ci/build-linux.sh
displayName: Docker setup and build
@@ -56,9 +56,11 @@ jobs:
- job: Windows_Build
variables:
COMPILER: msvc
QT_VER: '5.14.2'
QT_DATE: '202003291224'
QTDIR: C:\Qt\$(QT_VER)\msvc2017_64
QT_VER_MAIN: '5'
QT_VER: '5.15.2'
QT_VER_MSVC: 'msvc2019'
QT_DATE: '202011130602'
QTDIR: C:\Qt\$(QT_VER)\$(QT_VER_MSVC)_64
VULKAN_VER: '1.2.154.1'
VULKAN_SDK_SHA: 'b64471f3a720e649c1fae6535ea83b8c642655ebed1485bfdf15bf4d88f746d9'
VULKAN_SDK: C:\VulkanSDK\$(VULKAN_VER)