From a68d9b45222e947385616f9bef7aa4be8d7a72b9 Mon Sep 17 00:00:00 2001
From: zurg3 <20664125+zurg3@users.noreply.github.com>
Date: Fri, 6 Nov 2020 19:10:14 +0300
Subject: [PATCH] Updated Qt version in GitHub Actions workflows

---
 .github/workflows/linux.yml | 14 +++++++-------
 .github/workflows/mac.yml   | 18 +++++++++---------
 .github/workflows/win.yml   | 12 ++++++------
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 6d69c0b1a..d71ca2a62 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -58,8 +58,8 @@ jobs:
 
     env:
       GIT: "https://github.com"
-      QT: "5_12_8"
-      QT_PREFIX: "/usr/local/desktop-app/Qt-5.12.8"
+      QT: "5_15_1"
+      QT_PREFIX: "/usr/local/desktop-app/Qt-5.15.1"
       OPENSSL_VER: "1_1_1"
       OPENSSL_PREFIX: "/usr/local/desktop-app/openssl-1.1.1"
       CMAKE_VER: "3.17.0"
@@ -427,18 +427,18 @@ jobs:
           cd ..
           rm -rf libxkbcommon
 
-      - name: Qt 5.12.8 cache.
+      - name: Qt 5.15.1 cache.
         id: cache-qt
         uses: actions/cache@v2
         with:
           path: ${{ env.LibrariesPath }}/qt-cache
-          key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qt*_5_12_8/*') }}
-      - name: Qt 5.12.8 build.
+          key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qt*_5_15_1/*') }}
+      - name: Qt 5.15.1 build.
         if: steps.cache-qt.outputs.cache-hit != 'true'
         run: |
           cd $LibrariesPath
 
-          git clone -b v5.12.8 --depth=1 git://code.qt.io/qt/qt5.git qt_${QT}
+          git clone -b v5.15.1 --depth=1 git://code.qt.io/qt/qt5.git qt_${QT}
           cd qt_${QT}
           perl init-repository --module-subset=qtbase,qtwayland,qtimageformats,qtsvg
           git submodule update qtbase qtwayland qtimageformats qtsvg
@@ -471,7 +471,7 @@ jobs:
           sudo make INSTALL_ROOT="$LibrariesPath/qt-cache" install
           cd ..
           rm -rf qt_${QT}
-      - name: Qt 5.12.8 install.
+      - name: Qt 5.15.1 install.
         run: |
           cd $LibrariesPath
           sudo cp -R qt-cache/. /
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index 48ad4d4da..fe1c08bea 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -57,9 +57,9 @@ jobs:
       PREFIX: "/usr/local/macos"
       MACOSX_DEPLOYMENT_TARGET: "10.12"
       XZ: "xz-5.2.4"
-      QT: "5_12_8"
+      QT: "5_15_1"
       OPENSSL_VER: "1_1_1"
-      QT_PREFIX: "/usr/local/desktop-app/Qt-5.12.8"
+      QT_PREFIX: "/usr/local/desktop-app/Qt-5.15.1"
       LIBICONV_VER: "libiconv-1.16"
       UPLOAD_ARTIFACT: "false"
       ONLY_CACHE: "false"
@@ -417,20 +417,20 @@ jobs:
           build/gyp_crashpad.py -Dmac_deployment_target=10.10
           ninja -C out/Debug
 
-      - name: Qt 5.12.8 cache.
+      - name: Qt 5.15.1 cache.
         id: cache-qt
         uses: actions/cache@v2
         with:
           path: ${{ env.LibrariesPath }}/qt-cache
-          key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qtbase_5_12_8/*') }}
-      - name: Use cached Qt 5.12.8.
+          key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qtbase_5_15_1/*') }}
+      - name: Use cached Qt 5.15.1.
         if: steps.cache-qt.outputs.cache-hit == 'true'
         run: |
           cd $LibrariesPath
-          mv qt-cache Qt-5.12.8
+          mv qt-cache Qt-5.15.1
           sudo mkdir -p $QT_PREFIX
-          sudo mv -f Qt-5.12.8 "$(dirname "$QT_PREFIX")"/
-      - name: Qt 5.12.8 build.
+          sudo mv -f Qt-5.15.1 "$(dirname "$QT_PREFIX")"/
+      - name: Qt 5.15.1 build.
         if: steps.cache-qt.outputs.cache-hit != 'true'
         run: |
           cd $LibrariesPath
@@ -438,7 +438,7 @@ jobs:
           git clone git://code.qt.io/qt/qt5.git qt_$QT
           cd qt_$QT
           perl init-repository --module-subset=qtbase,qtimageformats
-          git checkout v5.12.8
+          git checkout v5.15.1
           git submodule update qtbase
           git submodule update qtimageformats
           cd qtbase
diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
index 83ffcc001..6f3d1d6ce 100644
--- a/.github/workflows/win.yml
+++ b/.github/workflows/win.yml
@@ -59,8 +59,8 @@ jobs:
       SDK: "10.0.18362.0"
       VC: "call vcvars32.bat && cd Libraries"
       GIT: "https://github.com"
-      QT: "5_12_8"
-      QT_VER: "5.12.8"
+      QT: "5_15_1"
+      QT_VER: "5.15.1"
       OPENSSL_VER: "1_1_1"
       UPLOAD_ARTIFACT: "false"
       ONLY_CACHE: "false"
@@ -301,13 +301,13 @@ jobs:
 
           rmdir /S /Q .git
 
-      - name: Qt 5.12.8 cache.
+      - name: Qt 5.15.1 cache.
         id: cache-qt
         uses: actions/cache@v2
         with:
           path: ${{ env.LibrariesPath }}/Qt-${{ env.QT_VER }}
-          key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qtbase_5_12_8/*') }}
-      - name: Configure Qt 5.12.8.
+          key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qtbase_5_15_1/*') }}
+      - name: Configure Qt 5.15.1.
         if: steps.cache-qt.outputs.cache-hit != 'true'
         run: |
           %VC%
@@ -344,7 +344,7 @@ jobs:
           -I "%LibrariesPath%\mozjpeg" ^
           LIBJPEG_LIBS_DEBUG="%LibrariesPath%\mozjpeg\Debug\jpeg-static.lib" ^
           LIBJPEG_LIBS_RELEASE="%LibrariesPath%\mozjpeg\Release\jpeg-static.lib"
-      - name: Qt 5.12.8 build.
+      - name: Qt 5.15.1 build.
         if: steps.cache-qt.outputs.cache-hit != 'true'
         run: |
           %VC%