Update Qt to 5.15.2.

This commit is contained in:
John Preston 2020-12-07 15:50:22 +04:00
parent e97140a311
commit 25ffdcc919
6 changed files with 22 additions and 22 deletions

View File

@ -91,7 +91,7 @@ const auto kDictionaries = {
Dict{{ QLocale::Korean, 615, 1'256'987, "\xed\x95\x9c\xea\xb5\xad\xec\x96\xb4" }}, // ko_KR
Dict{{ QLocale::Lithuanian, 616, 267'427, "\x4c\x69\x65\x74\x75\x76\x69\xc5\xb3" }}, // lt_LT
Dict{{ QLocale::Latvian, 617, 641'602, "\x4c\x61\x74\x76\x69\x65\xc5\xa1\x75" }}, // lv_LV
Dict{{ QLocale::Norwegian, 618, 588'650, "\x4e\x6f\x72\x73\x6b" }}, // nb_NO
Dict{{ QLocale::NorwegianBokmal, 618, 588'650, "\x4e\x6f\x72\x73\x6b" }}, // nb_NO
Dict{{ QLocale::Dutch, 619, 743'406, "\x4e\x65\x64\x65\x72\x6c\x61\x6e\x64\x73" }}, // nl_NL
Dict{{ QLocale::Polish, 620, 1'015'747, "\x50\x6f\x6c\x73\x6b\x69" }}, // pl_PL
Dict{{ QLocale::Portuguese, 621, 1'231'999, "\x50\x6f\x72\x74\x75\x67\x75\xc3\xaa\x73 (Brazil)" }}, // pt_BR

View File

@ -2,9 +2,9 @@ FROM centos:7 AS builder
ENV GIT https://github.com
ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig
ENV QT 5_15_1
ENV QT_TAG v5.15.1
ENV QT_PREFIX /usr/local/desktop-app/Qt-5.15.1
ENV QT 5_15_2
ENV QT_TAG v5.15.2
ENV QT_PREFIX /usr/local/desktop-app/Qt-5.15.2
ENV OPENSSL_VER 1_1_1
ENV OPENSSL_PREFIX /usr/local/desktop-app/openssl-1.1.1
@ -28,7 +28,7 @@ WORKDIR $LibrariesPath
FROM builder AS patches
RUN git clone $GIT/desktop-app/patches.git
RUN cd patches && git checkout e052c49
RUN cd patches && git checkout f22ccc5
FROM builder AS libffi
RUN git clone -b v3.3 --depth=1 $GIT/libffi/libffi.git
@ -489,7 +489,7 @@ COPY --from=openssl ${LibrariesPath}/openssl-cache /
RUN git clone --recursive $GIT/desktop-app/tg_owt.git
WORKDIR tg_owt
RUN git checkout c73a471
RUN git checkout 75ac669
RUN cmake3 -B out/Release . \
-DCMAKE_BUILD_TYPE=Release \

@ -1 +1 @@
Subproject commit 577e8f94ab538b3b4b2a1365a078293c92506616
Subproject commit ea840471d2330c2763567c2e46b2414af6e0429d

2
cmake

@ -1 +1 @@
Subproject commit 4436815d19035aaba79cb69b7e2d599ae286297d
Subproject commit 28b11b099ad54151f38b7d5c0c00ff9ce12d4674

View File

@ -33,7 +33,7 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
cd ThirdParty
git clone https://github.com/desktop-app/patches.git
cd patches
git checkout e052c49
git checkout f22ccc5
cd ../
git clone https://chromium.googlesource.com/external/gyp
cd gyp
@ -63,7 +63,7 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
git clone https://github.com/desktop-app/patches.git
cd patches
git checkout e052c49
git checkout f22ccc5
cd ..
git clone https://github.com/desktop-app/lzma.git
@ -161,17 +161,17 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
cd ..
SET LibrariesPath=%cd%
git clone git://code.qt.io/qt/qt5.git qt_5_15_1
cd qt_5_15_1
git clone git://code.qt.io/qt/qt5.git qt_5_15_2
cd qt_5_15_2
perl init-repository --module-subset=qtbase,qtimageformats
git checkout v5.15.1
git checkout v5.15.2
git submodule update qtbase qtimageformats
cd qtbase
for /r %i in (..\..\patches\qtbase_5_15_1\*) do git apply %i
for /r %i in (..\..\patches\qtbase_5_15_2\*) do git apply %i
cd ..
configure ^
-prefix "%LibrariesPath%\Qt-5.15.1" ^
-prefix "%LibrariesPath%\Qt-5.15.2" ^
-debug-and-release ^
-force-debug-info ^
-opensource ^

View File

@ -29,7 +29,7 @@ Go to ***BuildPath*** and run
git clone https://github.com/desktop-app/patches.git
cd patches
git checkout e052c49
git checkout f22ccc5
cd ../
git clone https://chromium.googlesource.com/external/gyp
git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
@ -58,7 +58,7 @@ Go to ***BuildPath*** and run
git clone https://github.com/desktop-app/patches.git
cd patches
git checkout e052c49
git checkout f22ccc5
cd ..
git clone https://git.tukaani.org/xz.git
@ -269,16 +269,16 @@ Go to ***BuildPath*** and run
ninja -C out/Release
cd ..
git clone git://code.qt.io/qt/qt5.git qt_5_15_1
cd qt_5_15_1
git clone git://code.qt.io/qt/qt5.git qt_5_15_2
cd qt_5_15_2
perl init-repository --module-subset=qtbase,qtimageformats
git checkout v5.15.1
git checkout v5.15.2
git submodule update qtbase qtimageformats
cd qtbase
find ../../patches/qtbase_5_15_1 -type f -print0 | sort -z | xargs -0 git apply
find ../../patches/qtbase_5_15_2 -type f -print0 | sort -z | xargs -0 git apply
cd ..
./configure -prefix "/usr/local/desktop-app/Qt-5.15.1" \
./configure -prefix "/usr/local/desktop-app/Qt-5.15.2" \
-debug-and-release \
-force-debug-info \
-opensource \