From 92dcda11cc01927580eb6d9818818bc673206617 Mon Sep 17 00:00:00 2001
From: Richard Weickelt <richard@weickelt.de>
Date: Sat, 21 Sep 2019 14:27:41 +0200
Subject: Bump Qt version to 5.12.5 for automated builds

Also introduce accurate versioning for docker images. This
makes it possible to use different build environments in
different branches.

Change-Id: I4feb83dbba886c4369d661ec746428b0c89b80b4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 .travis.yml        | 14 ++++++++------
 docker-compose.yml |  4 ++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1e83ac8a5..ad6fbaaaf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,8 @@ git:
 env:
   global:
     - QT_INSTALL_DIR=~/Qt
+    - QT_VERSION=5.12.5
+    - QTCREATOR_VERSION=4.9.2
 
 stages:
   - name: Build Qbs and and run autotests
@@ -53,12 +55,12 @@ jobs:
         # Address sanitizer slows autotests down too much.
         # We would hit the maximum build time on Travis.
         BUILD_OPTIONS=modules.qbsbuildconfig.enableAddressSanitizer:false
-        QMAKE_PATH=${QT_INSTALL_DIR}/5.12.4/clang_64/bin/qmake
+        QMAKE_PATH=${QT_INSTALL_DIR}/${QT_VERSION}/clang_64/bin/qmake
         PATH="${QT_INSTALL_DIR}/Qt Creator.app/Contents/MacOS:${PATH}"
         QBS_BUILD_PROFILE=qt
       before_install:
-        - ./scripts/install-qt.sh -d ${QT_INSTALL_DIR} --version 5.12.4 qtbase qtdeclarative qttools qtscript
-        - ./scripts/install-qt.sh -d ${QT_INSTALL_DIR} --version 4.9.2 qtcreator
+        - ./scripts/install-qt.sh -d ${QT_INSTALL_DIR} --version ${QT_VERSION} qtbase qtdeclarative qttools qtscript
+        - ./scripts/install-qt.sh -d ${QT_INSTALL_DIR} --version ${QTCREATOR_VERSION} qtcreator
         - pip2 install --user beautifulsoup4 lxml
       script:
         - qbs setup-toolchains --detect
@@ -75,7 +77,7 @@ jobs:
         # Need to build in release mode. Otherwise autotests would be too slow.
         BUILD_OPTIONS="config:release"
         QT_INSTALL_DIR=C:/Qt
-        QMAKE_PATH=${QT_INSTALL_DIR}/5.12.4/msvc2017_64/bin/qmake.exe
+        QMAKE_PATH=${QT_INSTALL_DIR}/${QT_VERSION}/msvc2017_64/bin/qmake.exe
         PATH="/c/Qt/Tools/QtCreator/bin:${PATH}"
         WITH_DOCS=0
         QBS_BUILD_PROFILE=qt
@@ -93,8 +95,8 @@ jobs:
         - powershell -Command 'Add-MpPreference -ExclusionProcess link.exe'
 
         # Install Qbs and Qt
-        - ./scripts/install-qt.sh -d ${QT_INSTALL_DIR} --version 5.12.4 --toolchain win64_msvc2017_64 qtbase qtdeclarative qttools qtscript
-        - ./scripts/install-qt.sh -d ${QT_INSTALL_DIR} --version 4.9.2 qtcreator
+        - ./scripts/install-qt.sh -d ${QT_INSTALL_DIR} --version ${QT_VERSION} --toolchain win64_msvc2017_64 qtbase qtdeclarative qttools qtscript
+        - ./scripts/install-qt.sh -d ${QT_INSTALL_DIR} --version ${QTCREATOR_VERSION} qtcreator
       script:
         - qbs setup-toolchains --detect
         - qbs setup-qt ${QMAKE_PATH} qt
diff --git a/docker-compose.yml b/docker-compose.yml
index cdfa6ee55..16d9e361a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,12 +12,12 @@ services:
   bionic:
     << : *linux
     hostname: bionic
-    image: ${DOCKER_USER:-qbsbuild}/qbsdev:bionic
+    image: ${DOCKER_USER:-qbsbuild}/qbsdev:bionic-5.12.5_1.13.1-1
     build:
       dockerfile: docker/bionic/Dockerfile
       context: .
       args:
-        QT_VERSION: 5.12.4
+        QT_VERSION: 5.12.5
         QTCREATOR_VERSION: 4.9.2
 
   stretch:
-- 
cgit v1.2.3