Syping/qt5-llvm-mingw-docker
1
0
Fork 0
mirror of https://gitlab.com/Syping/qt5-llvm-mingw-docker.git synced 2024-11-24 14:50:23 +01:00
Code Issues Projects Releases Wiki Activity

Update to Qt 5.15

Browse source
This commit is contained in:
Syping 2020-06-12 13:52:40 +02:00
parent 4f40625a02
commit ffee7d00e9
3 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Dockerfile.shared
View file

@ -11,15 +11,15 @@ ENV QT_SYSCONF_DIR /etc/xdg
# Custom Version # Custom Version
ENV CUSTOM_VERSION YES ENV CUSTOM_VERSION YES
ENV QT_SERIES 5.12 ENV QT_SERIES 5.15
ENV QT_BUILD 8 ENV QT_BUILD 0
ENV ZLIB_VERSION 1.2.11 ENV ZLIB_VERSION 1.2.11
ENV LIBPNG_VERSION 1.6.37 ENV LIBPNG_VERSION 1.6.37
ENV LIBJPEGTURBO_VERSION 2.0.4 ENV LIBJPEGTURBO_VERSION 2.0.4
ENV LIBRESSL_VERSION 3.0.2 ENV LIBRESSL_VERSION 3.1.2
ENV OPENSSL_VERSION 1.1.1g ENV OPENSSL_VERSION 1.1.1g
ENV ICU_VERSION 66.1 ENV ICU_VERSION 67.1
ENV HB_VERSION 2.6.5 ENV HB_VERSION 2.6.7
# SSL Choice # SSL Choice
ENV CUSTOM_SSL YES ENV CUSTOM_SSL YES

10
Dockerfile.static
View file

@ -11,15 +11,15 @@ ENV QT_SYSCONF_DIR /etc/xdg
# Custom Version # Custom Version
ENV CUSTOM_VERSION YES ENV CUSTOM_VERSION YES
ENV QT_SERIES 5.12 ENV QT_SERIES 5.15
ENV QT_BUILD 8 ENV QT_BUILD 0
ENV ZLIB_VERSION 1.2.11 ENV ZLIB_VERSION 1.2.11
ENV LIBPNG_VERSION 1.6.37 ENV LIBPNG_VERSION 1.6.37
ENV LIBJPEGTURBO_VERSION 2.0.4 ENV LIBJPEGTURBO_VERSION 2.0.4
ENV LIBRESSL_VERSION 3.0.2 ENV LIBRESSL_VERSION 3.1.2
ENV OPENSSL_VERSION 1.1.1g ENV OPENSSL_VERSION 1.1.1g
ENV ICU_VERSION 66.1 ENV ICU_VERSION 67.1
ENV HB_VERSION 2.6.5 ENV HB_VERSION 2.6.7
# SSL Choice # SSL Choice
ENV CUSTOM_SSL YES ENV CUSTOM_SSL YES

10
qt_build
View file

@ -23,14 +23,14 @@ if [ ! "${CUSTOM_VERSION}" == "YES" ]; then
ZLIB_VERSION=1.2.11 ZLIB_VERSION=1.2.11
LIBPNG_VERSION=1.6.37 LIBPNG_VERSION=1.6.37
LIBJPEGTURBO_VERSION=2.0.4 LIBJPEGTURBO_VERSION=2.0.4
LIBRESSL_VERSION=3.0.2 LIBRESSL_VERSION=3.1.2
OPENSSL_VERSION=1.1.1g OPENSSL_VERSION=1.1.1g
ICU_VERSION=66.1 ICU_VERSION=67.1
HB_VERSION=2.6.5 # HarfBuzz HB_VERSION=2.6.7 # HarfBuzz
# Qt Framework # Qt Framework
QT_SERIES=5.12 # (x.x).y QT_SERIES=5.15 # (x.x).y
QT_BUILD=8 # x.x.(y) QT_BUILD=0 # x.x.(y)
fi fi
# -------------------------------------- # --------------------------------------