From ed70675e1d401ee1f54ce7976eb66d869bfa092b Mon Sep 17 00:00:00 2001 From: wention Date: Sun, 31 Mar 2024 12:51:43 +0800 Subject: [PATCH] Fix build Qt error on non-english windows os --- Telegram/build/prepare/prepare.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py index 9a2ef4944..8d472eef3 100644 --- a/Telegram/build/prepare/prepare.py +++ b/Telegram/build/prepare/prepare.py @@ -59,6 +59,7 @@ for arg in sys.argv[1:]: options.append(arg) elif arg == 'run': customRunCommand = True + buildQt5 = not 'skip-qt5' in options if win else 'build-qt5' in options buildQt6 = 'build-qt6' in options if win else not 'skip-qt6' in options @@ -1405,7 +1406,7 @@ if buildQt5: stage('qt_5_15_13', """ git clone -b v5.15.13-lts-lgpl https://github.com/qt/qt5.git qt_5_15_13 cd qt_5_15_13 - perl init-repository --module-subset=qtbase,qtimageformats,qtsvg + git submodule update --init --recursive qtbase qtimageformats qtsvg depends:patches/qtbase_5.15.13/*.patch cd qtbase win: @@ -1491,7 +1492,7 @@ if buildQt6: mac: git clone -b v6.2.7-lts-lgpl https://github.com/qt/qt5.git qt_6_2_7 cd qt_6_2_7 - perl init-repository --module-subset=qtbase,qtimageformats,qtsvg + git submodule update --init --recursive qtbase qtimageformats qtsvg depends:patches/qtbase_6.2.7/*.patch cd qtbase find ../../patches/qtbase_6.2.7 -type f -print0 | sort -z | xargs -0 git apply -v