This commit is contained in:
Ilya Fedin 2020-05-31 09:48:04 +04:00 committed by John Preston
parent d8d3dda2f3
commit 1d622fb3c0
4 changed files with 15 additions and 5 deletions

View File

@ -415,7 +415,7 @@ jobs:
uses: actions/cache@v1
with:
path: ${{ env.LibrariesPath }}/qt-cache
key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qtbase_5_12_8.diff') }}
key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qt*_5_12_8.diff') }}
- name: Qt 5.12.8 build.
if: steps.cache-qt.outputs.cache-hit != 'true'
run: |
@ -427,7 +427,12 @@ jobs:
git submodule update qtbase qtwayland qtimageformats qtsvg qtx11extras
cd qtbase
git apply ../../patches/qtbase_${QT}.diff
cd ../
git apply ../../patches/qtbase_xkbfix_${QT}.diff
cd ..
cd qtwayland
git apply ../../patches/qtwayland_${QT}.diff
git apply ../../patches/qtwayland_xkbfix_${QT}.diff
cd ..
./configure -prefix "$QT_PREFIX" \
-release \

@ -1 +1 @@
Subproject commit db2a1279d69b37a509e9b7855530abf2a5a2c6f9
Subproject commit e27395cf1878662f177f7aaea48a82e044da6b53

2
cmake

@ -1 +1 @@
Subproject commit f4271f2cd44b66b042a076ef1e2fa0d442c33afe
Subproject commit 7c151a302a22ba362a0f02a5572b7b307cc3afe7

View File

@ -54,7 +54,7 @@ Go to ***BuildPath*** and run
git clone https://github.com/desktop-app/patches.git
cd patches
git checkout b08b497
git checkout fd42dc2
cd ../
git clone https://github.com/xiph/opus
@ -241,6 +241,11 @@ Go to ***BuildPath*** and run
git submodule update qtbase qtwayland qtimageformats qtsvg qtx11extras
cd qtbase
git apply ../../patches/qtbase_5_12_8.diff
git apply ../../patches/qtbase_xkbfix_5_12_8.diff
cd ..
cd qtwayland
git apply ../../patches/qtwayland_5_12_8.diff
git apply ../../patches/qtwayland_xkbfix_5_12_8.diff
cd ..
OPENSSL_DIR=/usr/local/desktop-app/openssl-1.1.1