From 0b31d2b31ad636e66b330689c70c062c65300463 Mon Sep 17 00:00:00 2001
From: Elias Steurer <i@kelteseth.net>
Date: Mon, 10 Aug 2020 17:42:49 +0200
Subject: [PATCH] Fix windows c++20 compiler error by updating Qt to 5.14.2

---
 .gitlab-ci.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aa205bd5..82d41650 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,14 +18,18 @@ build:windows:
         - cmd /c " `"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat`" && set > `"$tempFile`" " 
         - Get-Content $tempFile | Foreach-Object {if($_ -match "^(.*?)=(.*)$"){Set-Content "env:\$($matches[1])" $matches[2]}}
         - Remove-Item $tempFile
-        - $Env:Path += ';C:\Qt\5.14.0\msvc2017_64\bin'
+        - $Env:Path += ';C:\Qt\5.14.2\msvc2017_64\bin'
         - $Env:Path += ';C:\Qt\Tools\QtCreator\bin'
         - $env:path -split ";"
+    cache:
+        key: ${CI_RUNNER_DESCRIPTION}
+        paths:
+            - Common\vcpkg\
     script:
         - .\install_dependencies_windows.bat
         - mkdir BUILD_WINDOWS
         - cd BUILD_WINDOWS
-        - cmake.exe ../  -DCMAKE_PREFIX_PATH=c:/Qt/5.14.0/msvc2017 -DCMAKE_IGNORE_PATH=C:/Strawberry/c/bin -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="$(Get-Location)/../Common/vcpkg/scripts/buildsystems/vcpkg.cmake" -DVCPKG_TARGET_TRIPLET=x64-windows "-GCodeBlocks - Ninja" -B.
+        - cmake.exe ../  -DCMAKE_PREFIX_PATH=c:/Qt/5.14.2/msvc2017 -DCMAKE_IGNORE_PATH=C:/Strawberry/c/bin -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="$(Get-Location)/../Common/vcpkg/scripts/buildsystems/vcpkg.cmake" -DVCPKG_TARGET_TRIPLET=x64-windows "-GCodeBlocks - Ninja" -B.
         - cmake.exe --build . --target all
         - cd bin
         - windeployqt.exe  --release  --qmldir ../../Client/qml Client.exe