From 46436b9d6959f0d15c07c653884b66712ead901a Mon Sep 17 00:00:00 2001
From: Ivan Komissarov <ABBAPOH@gmail.com>
Date: Fri, 8 May 2020 21:48:46 +0200
Subject: Travis: update qbs to 1.15.1 and Qt to 5.12.8

This includes macOS, Linux and windows jobs, but does not include
Android job

Change-Id: I59331191b9f3c402930ed4b3454e1b3f4d6d9807
Reviewed-by: Richard Weickelt <richard@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 docker-compose.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'docker-compose.yml')

diff --git a/docker-compose.yml b/docker-compose.yml
index 2b777c6f3..a17d29e94 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,13 +15,13 @@ services:
   bionic:
     << : *linux
     hostname: bionic
-    image: ${DOCKER_USER:-qbsbuild}/qbsdev:bionic-5.12.6_1.14.1-5
+    image: ${DOCKER_USER:-qbsbuild}/qbsdev:bionic-5.12.8_1.15.1-0
     build:
       dockerfile: docker/bionic/Dockerfile
       context: .
       args:
-        QT_VERSION: 5.12.6
-        QTCREATOR_VERSION: 4.10.2
+        QT_VERSION: 5.12.8
+        QTCREATOR_VERSION: 4.11.2
 
   bionic-android-513:
     << : *linux
-- 
cgit v1.2.3