From 9c970a3cb7029c03969ebb63d7a6fb4fc39b01b1 Mon Sep 17 00:00:00 2001 From: "Koenig, Joerg" Date: Sat, 6 Jun 2020 20:24:49 +0200 Subject: Update to Qt 5.15.0 Change-Id: I7e43a886eec9dab0f17201b564ae278db49fb2c6 --- Jenkinsfile | 6 +++--- Makefile | 8 ++++---- Makefile.mingw64 | 6 +++--- Makefile.qtcreator | 6 +++--- Makefile.qtwintools | 6 +++--- Makefile.x86-linux | 4 ++-- Makefile.xmingw64 | 12 ++++++------ SOURCE/Makefile | 7 ++++--- 8 files changed, 28 insertions(+), 27 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d8b5015..83728d6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -32,14 +32,14 @@ stage('Build') { stage("Qt Build") { sh '''#!/bin/bash export PATH=$GCC_PATH/bin:$PATH - make GCC_PATH=/master/DEV-Tools/gcc-suite/1.6.0/x86-linux64/gcc -f Makefile all + make GCC_PATH=/master/DEV-Tools/gcc-suite/1.7.0/x86-linux64/gcc -f Makefile all ''' } stage("Qt-Creator Build") { sh '''#!/bin/bash - export PATH=/master/DEV-Tools/gcc-suite/1.6.0/x86-linux64/gcc/bin:$PATH + export PATH=/master/DEV-Tools/gcc-suite/1.7.0/x86-linux64/gcc/bin:$PATH export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$WORKSPACE/install.x86-linux64/qt-5.14.2-shared/lib - make ARCH=x86-linux64 GCC_PATH=/master/DEV-Tools/gcc-suite/1.6.0/x86-linux64/gcc/bin QTDIR=$WORKSPACE/install.x86-linux64/qt-5.14.2-shared -f Makefile.qtcreator all + make ARCH=x86-linux64 GCC_PATH=/master/DEV-Tools/gcc-suite/1.7.0/x86-linux64/gcc/bin QTDIR=$WORKSPACE/install.x86-linux64/qt-5.15.0-shared -f Makefile.qtcreator all ''' } } diff --git a/Makefile b/Makefile index 79493d3..3d2ea26 100644 --- a/Makefile +++ b/Makefile @@ -7,16 +7,16 @@ JOBS = 2 LOCAL_BUILD_PATH = $(TOP)/build.$(ARCH) LOCAL_INST_PATH = $(TOP)/install.$(ARCH) -VERSION_SHORT=5.14 -VERSION_RELEASE=2 +VERSION_SHORT=5.15 +VERSION_RELEASE=0 VERSION=$(VERSION_SHORT).$(VERSION_RELEASE) -SSL_VERSION=1.0.2r +SSL_VERSION=1.1.1g SSL_ARCHIVE=openssl-$(SSL_VERSION).tar.gz PACKAGE_NAME = qt-$(VERSION) -GCC_PATH ?= /opt/dev-tools/gcc-suite/1.6.0/x86-linux64/gcc +GCC_PATH ?= /opt/dev-tools/gcc-suite/1.7.0/x86-linux64/gcc CC ?= $(GCC_PATH)/bin/gcc CXX ?= $(GCC_PATH)/bin/g++ diff --git a/Makefile.mingw64 b/Makefile.mingw64 index 841399f..8e5d85e 100644 --- a/Makefile.mingw64 +++ b/Makefile.mingw64 @@ -5,11 +5,11 @@ ARCH = x86-mingw64 LOCAL_BUILD_PATH = $(TOP)/build.$(ARCH) LOCAL_INST_PATH = $(TOP)/install.$(ARCH) -VERSION_SHORT = 5.14 -VERSION_RELEASE = 2 +VERSION_SHORT = 5.15 +VERSION_RELEASE = 0 VERSION = $(VERSION_SHORT).$(VERSION_RELEASE) -SSL_VERSION = 1.0.2r +SSL_VERSION = 1.1.1g SSL_ARCHIVE = openssl-$(SSL_VERSION).tar.gz diff --git a/Makefile.qtcreator b/Makefile.qtcreator index 9d5229b..d06f84c 100644 --- a/Makefile.qtcreator +++ b/Makefile.qtcreator @@ -5,8 +5,8 @@ TOP = $(shell readlink -f .) VERSION = 4.11 RELEASE = 2 -QT_VERSION = 5.14 -QT_RELEASE = 2 +QT_VERSION = 5.15 +QT_RELEASE = 0 TARURL = https://download.qt.io/official_releases/qtcreator/$(VERSION)/$(VERSION).$(RELEASE)/qt-creator-opensource-src-$(VERSION).$(RELEASE).tar.gz ZIPURL = https://download.qt.io/official_releases/qtcreator/$(VERSION)/$(VERSION).$(RELEASE)/qt-creator-opensource-src-$(VERSION).$(RELEASE).zip 7ZIP = $(TOP)/wintools/7za.exe @@ -27,7 +27,7 @@ endif BUILD_OS = $(shell uname -s) -QTDIR = $(PWD)/install.$(ARCH)/qt-5.14.2-shared +QTDIR = $(PWD)/install.$(ARCH)/qt-5.15.0-shared BUILDDIR = $(PWD)/build-qtcreator.$(ARCH) INSTDIR = $(PWD)/inst-qtcreator.$(ARCH) MY_PATH = $(PATH) diff --git a/Makefile.qtwintools b/Makefile.qtwintools index 405b1a4..361ea27 100644 --- a/Makefile.qtwintools +++ b/Makefile.qtwintools @@ -1,12 +1,12 @@ TOP = $(shell readlink -f .) -VERSION_SHORT = 5.14 -VERSION_RELEASE = 2 +VERSION_SHORT = 5.15 +VERSION_RELEASE = 0 VERSION = $(VERSION_SHORT).$(VERSION_RELEASE) 7ZIP = $(TOP)/wintools/7za.exe LOCAL_BUILD_PATH = c:/tmp/qtbuild -SRCDIR = $(LOCAL_BUILD_PATH)/qt-everywhere-src-5.14.2 +SRCDIR = $(LOCAL_BUILD_PATH)/qt-everywhere-src-5.15.0 TOOLS = moc rcc uic qlalr qvkgen tracegen diff --git a/Makefile.x86-linux b/Makefile.x86-linux index 7aa0b22..31698b4 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.14 -VERSION_RELEASE=2 +VERSION_SHORT=5.15 +VERSION_RELEASE=0 VERSION=$(VERSION_SHORT).$(VERSION_RELEASE) SSL_VERSION=1.0.2r diff --git a/Makefile.xmingw64 b/Makefile.xmingw64 index 1a48e07..f092168 100644 --- a/Makefile.xmingw64 +++ b/Makefile.xmingw64 @@ -7,17 +7,17 @@ JOBS = 1 LOCAL_BUILD_PATH = $(TOP)/build.$(ARCH) LOCAL_INST_PATH = $(TOP)/install.$(ARCH) -VERSION_SHORT=5.14 -VERSION_RELEASE=2 +VERSION_SHORT=5.15 +VERSION_RELEASE=0 VERSION=$(VERSION_SHORT).$(VERSION_RELEASE) -SSL_VERSION=1.0.2r +SSL_VERSION=1.1.1g SSL_ARCHIVE=openssl-$(SSL_VERSION).tar.gz PACKAGE_NAME = qt-$(VERSION) -GCC_PATH ?= /opt/dev-tools/gcc-suite/1.6.0/x86-linux64/gcc -CROSS_COMPILE ?= /opt/dev-tools/gcc-suite/1.6.0/x86-linux64/mingw64/bin/x86_64-w64-mingw32- +GCC_PATH ?= /opt/dev-tools/gcc-suite/1.7.0/x86-linux64/gcc +CROSS_COMPILE ?= /opt/dev-tools/gcc-suite/1.7.0/x86-linux64/mingw64/bin/x86_64-w64-mingw32- CC ?= $(GCC_PATH)/bin/gcc CXX ?= $(GCC_PATH)/bin/g++ @@ -102,7 +102,7 @@ qt.x86-mingw64.shared: -ssl \ -openssl \ -I$(LOCAL_INST_PATH)/openssl/include \ - -I/opt/dev-tools/gcc-suite/1.6.0/x86-linux64/mingw64/x86_64-w64-mingw32/include \ + -I/opt/dev-tools/gcc-suite/1.7.0/x86-linux64/mingw64/x86_64-w64-mingw32/include \ -L$(LOCAL_INST_PATH)/openssl/lib \ -nomake examples \ -nomake tests \ diff --git a/SOURCE/Makefile b/SOURCE/Makefile index 4c75873..4cce353 100644 --- a/SOURCE/Makefile +++ b/SOURCE/Makefile @@ -1,13 +1,14 @@ CWD = $(shell readlink -f .) -VERSION_SHORT = 5.14 -RELEASE = 2 +VERSION_SHORT = 5.15 +RELEASE = 0 VERSION = $(VERSION_SHORT).$(RELEASE) QT_SOURCE_ARCHIVE=qt-everywhere-src-$(VERSION).tar.xz QT_SOURCE_ARCHIVE2=qt-everywhere-src-$(VERSION).zip DL_URL="https://download.qt.io/official_releases/qt/$(VERSION_SHORT)/$(VERSION)/single" -SSL_VERSION=1.0.2r +#SSL_VERSION=1.0.2r +SSL_VERSION=1.1.1g SSL_ARCHIVE=openssl-$(SSL_VERSION).tar.gz SSL_DL_URL = "https://www.openssl.org/source/$(SSL_ARCHIVE)" -- cgit v0.12