mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 06:26:18 +00:00
Code Issues Releases Wiki Activity

Let Dockerfile define the Qt version in use

Browse Source
This commit is contained in:
Ilya Fedin
2023-02-24 06:02:41 +04:00
committed by John Preston
parent 596e9310e4
commit 84dbdc6e92
4 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Telegram/build/prepare/prepare.py
View File

@@ -404,7 +404,7 @@ if customRunCommand:
stage('patches', """
git clone https://github.com/desktop-app/patches.git
cd patches
git checkout 53214c8a8a
git checkout 73f5d4762f
""")
stage('msys64', """
@@ -1216,7 +1216,7 @@ if buildQt5:
perl init-repository --module-subset=qtbase,qtimageformats,qtsvg
git checkout v5.15.8-lts-lgpl
git submodule update qtbase qtimageformats qtsvg
depends:patches/qtbase_5_15_8/*.patch
depends:patches/qtbase_5.15.8/*.patch
cd qtbase
win:
for /r %%i in (..\\..\\patches\\qtbase_5_15_8\\*) do git apply %%i
@@ -1264,7 +1264,7 @@ win:
jom -j16
jom -j16 install
mac:
find ../../patches/qtbase_5_15_8 -type f -print0 | sort -z | xargs -0 git apply
find ../../patches/qtbase_5.15.8 -type f -print0 | sort -z | xargs -0 git apply
cd ..
CONFIGURATIONS=-debug
@@ -1297,10 +1297,10 @@ mac:
git clone -b v6.3.2 https://code.qt.io/qt/qt5.git qt_6_3_2
cd qt_6_3_2
perl init-repository --module-subset=qtbase,qtimageformats,qtsvg,qt5compat
depends:patches/qtbase_6_3_2/*.patch
depends:patches/qtbase_6.3.2/*.patch
cd qtbase
find ../../patches/qtbase_6_3_2 -type f -print0 | sort -z | xargs -0 git apply
find ../../patches/qtbase_6.3.2 -type f -print0 | sort -z | xargs -0 git apply
cd ..
CONFIGURATIONS=-debug