From 04a5ee4f5777806174b627cdd1ebc1d86b224251 Mon Sep 17 00:00:00 2001
From: "Koenig, Joerg" <Joerg.Koenig@techsat.com>
Date: Sat, 18 Apr 2020 00:40:44 +0200
Subject: Update to 5.14.2

Change-Id: I1f7c4deb87224a6b94d73864b6b1f4daa89921b6
---
 Makefile           | 2 +-
 Makefile.mingw64   | 1 +
 Makefile.x86-linux | 2 +-
 SOURCE/Makefile    | 2 +-
 buildqt32.bat      | 2 +-
 buildqt64.bat      | 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index ce9f605..2c42c1d 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ LOCAL_BUILD_PATH = $(TOP)/build.$(ARCH)
 LOCAL_INST_PATH = $(TOP)/install.$(ARCH)
 
 VERSION_SHORT=5.14
-VERSION_RELEASE=0
+VERSION_RELEASE=2
 VERSION=$(VERSION_SHORT).$(VERSION_RELEASE)
 
 SSL_VERSION=1.0.2r
diff --git a/Makefile.mingw64 b/Makefile.mingw64
index 521de95..498a9ae 100644
--- a/Makefile.mingw64
+++ b/Makefile.mingw64
@@ -85,6 +85,7 @@ qt.$(ARCH):
 			-qt-libpng \
 			-qt-pcre \
 			-qt-freetype \
+			-qt-doubleconversion \
 			-opengl desktop \
 			-openssl \
 			-I$(QT_INST_PATH)/include \
diff --git a/Makefile.x86-linux b/Makefile.x86-linux
index 3809eec..a29e0b7 100644
--- a/Makefile.x86-linux
+++ b/Makefile.x86-linux
@@ -8,7 +8,7 @@ LOCAL_BUILD_PATH = $(TOP)/build.$(ARCH)
 LOCAL_INST_PATH = $(TOP)/install.$(ARCH)
 
 VERSION_SHORT=5.14
-VERSION_RELEASE=0
+VERSION_RELEASE=2
 VERSION=$(VERSION_SHORT).$(VERSION_RELEASE)
 
 SSL_VERSION=1.0.2r
diff --git a/SOURCE/Makefile b/SOURCE/Makefile
index e29dbf7..a652954 100644
--- a/SOURCE/Makefile
+++ b/SOURCE/Makefile
@@ -1,7 +1,7 @@
 CWD	= $(shell readlink -f .)
 
 VERSION_SHORT	= 5.14
-RELEASE = 0
+RELEASE = 2
 VERSION	= $(VERSION_SHORT).$(RELEASE)
 QT_SOURCE_ARCHIVE=qt-everywhere-src-$(VERSION).tar.xz
 DL_URL="https://download.qt.io/official_releases/qt/$(VERSION_SHORT)/$(VERSION)/single/$(QT_SOURCE_ARCHIVE)"
diff --git a/buildqt32.bat b/buildqt32.bat
index 8c0bf3c..8ab98dd 100644
--- a/buildqt32.bat
+++ b/buildqt32.bat
@@ -23,7 +23,7 @@ set PATH=%PERLDIR%\bin;%MSYSDIR%\usr\bin;%PATH%
 set PERL=%PERLDIR%\bin\perl.exe
 
 SET QT_VERSION=5.14
-SET QT_RELEASE=0
+SET QT_RELEASE=2
 
 SET QT_FULL_VER=%QT_VERSION%.%QT_RELEASE%
 SET QT_SOURCE_ARCHIVE=qt-everywhere-src-%QT_FULL_VER%.zip
diff --git a/buildqt64.bat b/buildqt64.bat
index 0ae3392..fd6879b 100644
--- a/buildqt64.bat
+++ b/buildqt64.bat
@@ -23,7 +23,7 @@ set PATH=%PERLDIR%\bin;%MSYSDIR%\usr\bin;%PATH%
 set PERL=%PERLDIR%\bin\perl.exe
 
 SET QT_VERSION=5.14
-SET QT_RELEASE=0
+SET QT_RELEASE=2
 
 SET QT_FULL_VER=%QT_VERSION%.%QT_RELEASE%
 SET QT_SOURCE_ARCHIVE=qt-everywhere-src-%QT_FULL_VER%.zip
-- 
cgit v0.12