From c055c8543b0973c722291bb94fde0f68577e111d Mon Sep 17 00:00:00 2001 From: "Koenig, Joerg" Date: Fri, 6 Sep 2019 08:52:58 +0200 Subject: Update to new version 5.13.1 Update of Qt to new version Change-Id: I565f286be6d26f86b58efeb27892d5770d3e3c53 (cherry picked from commit 2f1bcbe7032657f5eede3c12e08002c729883f1e) --- Jenkinsfile | 2 +- Makefile | 4 ++-- Makefile.mingw64 | 4 ++-- Makefile.x86-linux | 4 ++-- SOURCE/Makefile | 4 ++-- buildqt32.bat | 4 ++-- buildqt64.bat | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2e9e0bf..493f008 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -96,7 +96,7 @@ stage ("Post processing") { node('bslp02-centos6-64') { unstash name: 'qtwin' sh ''' - QT_VER=5.12.3 + QT_VER=5.13.1 # # cleanup temporary destination folder for final distribution ... # unpack Linux archives ... diff --git a/Makefile b/Makefile index 4f52e72..fa9185c 100644 --- a/Makefile +++ b/Makefile @@ -7,8 +7,8 @@ JOBS = 2 LOCAL_BUILD_PATH = $(TOP)/build.$(ARCH) LOCAL_INST_PATH = $(TOP)/install.$(ARCH) -VERSION_SHORT=5.12 -VERSION_RELEASE=3 +VERSION_SHORT=5.13 +VERSION_RELEASE=1 VERSION=$(VERSION_SHORT).$(VERSION_RELEASE) SSL_VERSION=1.0.2r diff --git a/Makefile.mingw64 b/Makefile.mingw64 index 3b6018f..bbd0280 100644 --- a/Makefile.mingw64 +++ b/Makefile.mingw64 @@ -5,8 +5,8 @@ ARCH = x86-mingw64 LOCAL_BUILD_PATH = $(TOP)/build.$(ARCH) LOCAL_INST_PATH = $(TOP)/install.$(ARCH) -VERSION_SHORT = 5.12 -VERSION_RELEASE = 3 +VERSION_SHORT = 5.13 +VERSION_RELEASE = 1 VERSION = $(VERSION_SHORT).$(VERSION_RELEASE) SSL_VERSION = 1.0.2r diff --git a/Makefile.x86-linux b/Makefile.x86-linux index b3f2856..6fe6f7e 100644 --- a/Makefile.x86-linux +++ b/Makefile.x86-linux @@ -7,8 +7,8 @@ JOBS = 2 LOCAL_BUILD_PATH = $(TOP)/build.$(ARCH) LOCAL_INST_PATH = $(TOP)/install.$(ARCH) -VERSION_SHORT=5.12 -VERSION_RELEASE=3 +VERSION_SHORT=5.13 +VERSION_RELEASE=1 VERSION=$(VERSION_SHORT).$(VERSION_RELEASE) SSL_VERSION=1.0.2r diff --git a/SOURCE/Makefile b/SOURCE/Makefile index 03be040..fa9f6ea 100644 --- a/SOURCE/Makefile +++ b/SOURCE/Makefile @@ -1,7 +1,7 @@ CWD = $(shell readlink -f .) -VERSION_SHORT = 5.12 -RELEASE = 3 +VERSION_SHORT = 5.13 +RELEASE = 1 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 9b14289..aee0615 100644 --- a/buildqt32.bat +++ b/buildqt32.bat @@ -22,8 +22,8 @@ if not defined MSYSDIR ( set PATH=%PERLDIR%\bin;%MSYSDIR%\usr\bin;%PATH% set PERL=%PERLDIR%\bin\perl.exe -SET QT_VERSION=5.12 -SET QT_RELEASE=3 +SET QT_VERSION=5.13 +SET QT_RELEASE=1 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 46407c5..46ea712 100644 --- a/buildqt64.bat +++ b/buildqt64.bat @@ -22,8 +22,8 @@ if not defined MSYSDIR ( set PATH=%PERLDIR%\bin;%MSYSDIR%\usr\bin;%PATH% set PERL=%PERLDIR%\bin\perl.exe -SET QT_VERSION=5.12 -SET QT_RELEASE=3 +SET QT_VERSION=5.13 +SET QT_RELEASE=1 SET QT_FULL_VER=%QT_VERSION%.%QT_RELEASE% SET QT_SOURCE_ARCHIVE=qt-everywhere-src-%QT_FULL_VER%.zip -- cgit v0.12