Merge pull request #4565

fe363d4 docker: update Qt to 5.15.18 (selsta)
This commit is contained in:
tobtoht
2026-02-02 12:05:07 +00:00
3 changed files with 3 additions and 3 deletions

View File

@@ -5,7 +5,7 @@ ARG ANDROID_NDK_REVISION=23c
ARG ANDROID_NDK_HASH=e5053c126a47e84726d9f7173a04686a71f9a67a ARG ANDROID_NDK_HASH=e5053c126a47e84726d9f7173a04686a71f9a67a
ARG ANDROID_SDK_REVISION=7302050_latest ARG ANDROID_SDK_REVISION=7302050_latest
ARG ANDROID_SDK_HASH=7a00faadc0864f78edd8f4908a629a46d622375cbe2e5814e82934aebecdb622 ARG ANDROID_SDK_HASH=7a00faadc0864f78edd8f4908a629a46d622375cbe2e5814e82934aebecdb622
ARG QT_VERSION=v5.15.17-lts-lgpl ARG QT_VERSION=v5.15.18-lts-lgpl
WORKDIR /opt/android WORKDIR /opt/android
ENV WORKDIR=/opt/android ENV WORKDIR=/opt/android

View File

@@ -1,7 +1,7 @@
FROM ubuntu:18.04 FROM ubuntu:18.04
ARG THREADS=1 ARG THREADS=1
ARG QT_VERSION=v5.15.17-lts-lgpl ARG QT_VERSION=v5.15.18-lts-lgpl
ENV CFLAGS="-fPIC" ENV CFLAGS="-fPIC"
ENV CPPFLAGS="-fPIC" ENV CPPFLAGS="-fPIC"

View File

@@ -1,7 +1,7 @@
FROM ubuntu:20.04 FROM ubuntu:20.04
ARG THREADS=1 ARG THREADS=1
ARG QT_VERSION=v5.15.17-lts-lgpl ARG QT_VERSION=v5.15.18-lts-lgpl
ENV SOURCE_DATE_EPOCH=1397818193 ENV SOURCE_DATE_EPOCH=1397818193
RUN apt update && \ RUN apt update && \