From 737f9e51d8a367fb24d04b26ac9705c7d08a80a3 Mon Sep 17 00:00:00 2001
From: Le Tan <tamlokveer@gmail.com>
Date: Wed, 26 Jan 2022 20:49:06 -0800
Subject: [PATCH] upgrade Qt to 5.15.2 (#2031)

upgrade Qt to 5.15.2
---
 .github/workflows/ci-linux.yml |  8 ++++----
 .github/workflows/ci-macos.yml |  6 +++---
 .github/workflows/ci-win.yml   | 16 ++++++++--------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
index 0c14eb31..c2ed48f3 100644
--- a/.github/workflows/ci-linux.yml
+++ b/.github/workflows/ci-linux.yml
@@ -45,14 +45,14 @@ jobs:
         uses: actions/cache@v1  # not v2!
         with:
           path: ../Qt
-          key: ${{ runner.os }}-QtCache
-          
+          key: ${{ runner.os }}-QtCache-5.15-1
+
       - name: Install Qt
         uses: jurplel/install-qt-action@v2
         with:
-          version: 5.12.10
+          version: 5.15.2
           target: desktop
-          modules: qtwebchannel qtwebengine qtsvg qtlocation qttools qttranslations
+          modules: qtwebengine
           tools: tools_openssl_x64,1.1.1-4,qt.tools.openssl.gcc_64
           cached: ${{ steps.cache-qt.outputs.cache-hit }}
 
diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml
index ab2d56d8..815f2c04 100644
--- a/.github/workflows/ci-macos.yml
+++ b/.github/workflows/ci-macos.yml
@@ -44,14 +44,14 @@ jobs:
         uses: actions/cache@v1  # not v2!
         with:
           path: ../Qt
-          key: ${{ runner.os }}-QtCache
+          key: ${{ runner.os }}-QtCache-5.15-1
 
       - name: Install Qt
         uses: jurplel/install-qt-action@v2
         with:
-          version: 5.12.10
+          version: 5.15.2
           target: desktop
-          modules: qtwebchannel qtwebengine qtsvg qtlocation qttools qttranslations
+          modules: qtwebengine
           cached: ${{ steps.cache-qt.outputs.cache-hit }}
 
 
diff --git a/.github/workflows/ci-win.yml b/.github/workflows/ci-win.yml
index 8df99158..e836d3fd 100644
--- a/.github/workflows/ci-win.yml
+++ b/.github/workflows/ci-win.yml
@@ -23,12 +23,12 @@ jobs:
         config:
           - {
             name: "Build On Win64",
-            arch: win64_msvc2017_64,
+            arch: win64_msvc2019_64,
             platform: x64
           }
           - {
             name: "Build On Win32",
-            arch: win32_msvc2017,
+            arch: win32_msvc2019,
             platform: x86
           }
 
@@ -50,15 +50,15 @@ jobs:
         uses: actions/cache@v1  # not v2!
         with:
           path: ../Qt
-          key: ${{ runner.os }}-${{matrix.config.arch}}-QtCache
+          key: ${{ runner.os }}-${{matrix.config.arch}}-QtCache-5.15-1
 
       - name: Install Qt
         uses: jurplel/install-qt-action@v2
         with:
-          version: 5.12.10
+          version: 5.15.2
           target: desktop
           arch: ${{matrix.config.arch}}
-          modules: qtwebchannel qtwebengine qtsvg qtlocation qttools qttranslations
+          modules: qtwebengine
           tools: tools_openssl_${{matrix.config.platform}},1.1.1-4,qt.tools.openssl.win_${{matrix.config.platform}}
           cached: ${{ steps.cache-qt.outputs.cache-hit }}
 
@@ -76,7 +76,7 @@ jobs:
       - name: Configure and Build Project
         shell: cmd
         run: |
-          call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" ${{matrix.config.platform}}
+          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{matrix.config.platform}}
           qmake -r -spec win32-msvc CONFIG-=debug CONFIG+=release %GITHUB_WORKSPACE%\vnote.pro
           nmake
         working-directory: ${{runner.workspace}}/build
@@ -85,7 +85,7 @@ jobs:
         shell: cmd
         run: |
           mkdir "%DISTRIB_PATH%"
-          call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" ${{matrix.config.platform}}
+          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{matrix.config.platform}}
           windeployqt.exe --dir "%DISTRIB_PATH%" .\src\release\vnote.exe
           copy .\src\release\vnote.exe "%DISTRIB_PATH%\vnote.exe"
           copy .\src\release\vnote_extra.rcc "%DISTRIB_PATH%\vnote_extra.rcc"
@@ -94,7 +94,7 @@ jobs:
           rem set qt_dir=%Qt5_Dir:/=\%
           rem for %%I in ("%qt_dir%\..\..") do set "qt_topdir=%%~fI"
           rem set openssl_dir=%qt_topdir%\Tools\OpenSSL\Win_${{matrix.config.platform}}\bin
-          set openssl_dir=openssl-utils.git\1.1.1g\Win_${{matrix.config.platform}}
+          set openssl_dir=openssl-utils.git\1.1.1j\Win_${{matrix.config.platform}}
           copy %openssl_dir%\lib*.dll "%DISTRIB_PATH%\"
           copy "%GITHUB_WORKSPACE%\README.md" "%DISTRIB_PATH%\README.md"
           copy "%GITHUB_WORKSPACE%\COPYING.LESSER" "%DISTRIB_PATH%\COPYING.LESSER"