diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2022-12-01 23:48:54 -0600 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2022-12-01 23:48:54 -0600 |
| commit | 9924dfe8af2f6aa1a2f2db0230f5cb85df8e104e (patch) | |
| tree | 48cf4733e1e93129d37318e13a9a0d0fef20c0e4 | |
| parent | 47f336bf336e7bad6c3c7fb38612e029a3416dbd (diff) | |
| parent | 6984bb8113d1fc4143707e2ac66789a746c6df14 (diff) | |
| download | monzero-gui-9924dfe8af2f6aa1a2f2db0230f5cb85df8e104e.tar.gz monzero-gui-9924dfe8af2f6aa1a2f2db0230f5cb85df8e104e.tar.xz monzero-gui-9924dfe8af2f6aa1a2f2db0230f5cb85df8e104e.zip | |
Merge pull request #4066
6984bb8 docker: update Qt to 5.15.7 (selsta)
| -rw-r--r-- | Dockerfile.android | 4 | ||||
| -rw-r--r-- | Dockerfile.linux | 2 | ||||
| -rw-r--r-- | Dockerfile.windows | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Dockerfile.android b/Dockerfile.android index 2efc1d68..0121f46f 100644 --- a/Dockerfile.android +++ b/Dockerfile.android @@ -5,12 +5,12 @@ ARG ANDROID_NDK_REVISION=21e ARG ANDROID_NDK_HASH=c3ebc83c96a4d7f539bd72c241b2be9dcd29bda9 ARG ANDROID_SDK_REVISION=7302050_latest ARG ANDROID_SDK_HASH=7a00faadc0864f78edd8f4908a629a46d622375cbe2e5814e82934aebecdb622 -ARG QT_VERSION=v5.15.6-lts-lgpl +ARG QT_VERSION=v5.15.7-lts-lgpl WORKDIR /opt/android ENV WORKDIR=/opt/android -ENV ANDROID_NATIVE_API_LEVEL=29 +ENV ANDROID_NATIVE_API_LEVEL=30 ENV ANDROID_API=android-${ANDROID_NATIVE_API_LEVEL} ENV ANDROID_CLANG=aarch64-linux-android${ANDROID_NATIVE_API_LEVEL}-clang ENV ANDROID_CLANGPP=aarch64-linux-android${ANDROID_NATIVE_API_LEVEL}-clang++ diff --git a/Dockerfile.linux b/Dockerfile.linux index 442ffaf8..2dd02fb4 100644 --- a/Dockerfile.linux +++ b/Dockerfile.linux @@ -1,7 +1,7 @@ FROM ubuntu:16.04 ARG THREADS=1 -ARG QT_VERSION=v5.15.6-lts-lgpl +ARG QT_VERSION=v5.15.7-lts-lgpl ENV CFLAGS="-fPIC" ENV CPPFLAGS="-fPIC" diff --git a/Dockerfile.windows b/Dockerfile.windows index e302c8e5..abadcc75 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -1,7 +1,7 @@ FROM ubuntu:20.04 ARG THREADS=1 -ARG QT_VERSION=v5.15.6-lts-lgpl +ARG QT_VERSION=v5.15.7-lts-lgpl ENV SOURCE_DATE_EPOCH=1397818193 RUN apt update && \ |