From ffee7d00e9702727978e0b69831149a40b18c70c Mon Sep 17 00:00:00 2001 From: Syping Date: Fri, 12 Jun 2020 13:52:40 +0200 Subject: [PATCH] Update to Qt 5.15 --- Dockerfile.shared | 10 +++++----- Dockerfile.static | 10 +++++----- qt_build | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Dockerfile.shared b/Dockerfile.shared index c150bdc..c2b29f9 100644 --- a/Dockerfile.shared +++ b/Dockerfile.shared @@ -11,15 +11,15 @@ ENV QT_SYSCONF_DIR /etc/xdg # Custom Version ENV CUSTOM_VERSION YES -ENV QT_SERIES 5.12 -ENV QT_BUILD 8 +ENV QT_SERIES 5.15 +ENV QT_BUILD 0 ENV ZLIB_VERSION 1.2.11 ENV LIBPNG_VERSION 1.6.37 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 ICU_VERSION 66.1 -ENV HB_VERSION 2.6.5 +ENV ICU_VERSION 67.1 +ENV HB_VERSION 2.6.7 # SSL Choice ENV CUSTOM_SSL YES diff --git a/Dockerfile.static b/Dockerfile.static index 33ea05b..b8f8c01 100644 --- a/Dockerfile.static +++ b/Dockerfile.static @@ -11,15 +11,15 @@ ENV QT_SYSCONF_DIR /etc/xdg # Custom Version ENV CUSTOM_VERSION YES -ENV QT_SERIES 5.12 -ENV QT_BUILD 8 +ENV QT_SERIES 5.15 +ENV QT_BUILD 0 ENV ZLIB_VERSION 1.2.11 ENV LIBPNG_VERSION 1.6.37 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 ICU_VERSION 66.1 -ENV HB_VERSION 2.6.5 +ENV ICU_VERSION 67.1 +ENV HB_VERSION 2.6.7 # SSL Choice ENV CUSTOM_SSL YES diff --git a/qt_build b/qt_build index fc01150..5e07f22 100644 --- a/qt_build +++ b/qt_build @@ -23,14 +23,14 @@ if [ ! "${CUSTOM_VERSION}" == "YES" ]; then ZLIB_VERSION=1.2.11 LIBPNG_VERSION=1.6.37 LIBJPEGTURBO_VERSION=2.0.4 - LIBRESSL_VERSION=3.0.2 + LIBRESSL_VERSION=3.1.2 OPENSSL_VERSION=1.1.1g - ICU_VERSION=66.1 - HB_VERSION=2.6.5 # HarfBuzz + ICU_VERSION=67.1 + HB_VERSION=2.6.7 # HarfBuzz # Qt Framework - QT_SERIES=5.12 # (x.x).y - QT_BUILD=8 # x.x.(y) + QT_SERIES=5.15 # (x.x).y + QT_BUILD=0 # x.x.(y) fi # --------------------------------------