diff options
| author | Koenig, Joerg <Joerg.Koenig@techsat.com> | 2020-01-23 16:45:10 (GMT) |
|---|---|---|
| committer | Koenig, Joerg <Joerg.Koenig@techsat.com> | 2020-01-23 16:45:10 (GMT) |
| commit | 0772050003a918969baef08a76e5a17ddfb42a0b (patch) | |
| tree | 417507af3db613ac53eddbaa77ba799be1700ff4 | |
| parent | 7de8f39c9161fcf7f3442f2a1c764ae81573b365 (diff) | |
| download | Qt-0772050003a918969baef08a76e5a17ddfb42a0b.zip Qt-0772050003a918969baef08a76e5a17ddfb42a0b.tar.gz Qt-0772050003a918969baef08a76e5a17ddfb42a0b.tar.bz2 | |
Update to QT 5.14.0
Resolves: :jira:<issue>
See also: :jira:<issue>
Change-Id: I22a7a5c736b4192cef09133afce55f7b6e1ba426
| -rw-r--r-- | Jenkinsfile | 2 | ||||
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | Makefile.mingw64 | 4 | ||||
| -rw-r--r-- | Makefile.x86-linux | 4 | ||||
| -rw-r--r-- | SOURCE/Makefile | 4 | ||||
| -rw-r--r-- | buildqt32.bat | 4 | ||||
| -rw-r--r-- | buildqt64.bat | 4 |
7 files changed, 13 insertions, 13 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index 7dbfced..4111e40 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -98,7 +98,7 @@ stage ("Post processing") { node('bslp02-centos6-64') { unstash name: 'qtwin' sh ''' - QT_VER=5.13.2 + QT_VER=5.14.0 # # cleanup temporary destination folder for final distribution ... # unpack Linux archives ... @@ -7,8 +7,8 @@ JOBS = 2 LOCAL_BUILD_PATH = $(TOP)/build.$(ARCH) LOCAL_INST_PATH = $(TOP)/install.$(ARCH) -VERSION_SHORT=5.13 -VERSION_RELEASE=2 +VERSION_SHORT=5.14 +VERSION_RELEASE=0 VERSION=$(VERSION_SHORT).$(VERSION_RELEASE) SSL_VERSION=1.0.2r diff --git a/Makefile.mingw64 b/Makefile.mingw64 index d0a76f9..521de95 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.13 -VERSION_RELEASE = 2 +VERSION_SHORT = 5.14 +VERSION_RELEASE = 0 VERSION = $(VERSION_SHORT).$(VERSION_RELEASE) SSL_VERSION = 1.0.2r diff --git a/Makefile.x86-linux b/Makefile.x86-linux index 6fe6f7e..3809eec 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.13 -VERSION_RELEASE=1 +VERSION_SHORT=5.14 +VERSION_RELEASE=0 VERSION=$(VERSION_SHORT).$(VERSION_RELEASE) SSL_VERSION=1.0.2r diff --git a/SOURCE/Makefile b/SOURCE/Makefile index 8b5c481..e29dbf7 100644 --- a/SOURCE/Makefile +++ b/SOURCE/Makefile @@ -1,7 +1,7 @@ CWD = $(shell readlink -f .) -VERSION_SHORT = 5.13 -RELEASE = 2 +VERSION_SHORT = 5.14 +RELEASE = 0 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 aee0615..8c0bf3c 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.13
-SET QT_RELEASE=1
+SET QT_VERSION=5.14
+SET QT_RELEASE=0
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 6551891..0ae3392 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.13
-SET QT_RELEASE=2
+SET QT_VERSION=5.14
+SET QT_RELEASE=0
SET QT_FULL_VER=%QT_VERSION%.%QT_RELEASE%
SET QT_SOURCE_ARCHIVE=qt-everywhere-src-%QT_FULL_VER%.zip
|