From a0ab55da7b91f00701de9a11a482dd12ba8192b4 Mon Sep 17 00:00:00 2001
From: Richard Weickelt <richard@weickelt.de>
Date: Wed, 25 Sep 2019 21:59:51 +0200
Subject: Add Xcode 11 to CI

This requires Qbs 1.14.1. And while we are at it, we can also upgrade Qt to
5.12.6 in all environments.

Task-number: QBS-1495
Change-Id: Iddb067cca37956f93c9bdf2acc95b2282a232b2b
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 f53d516c2..6770bebfd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,13 +12,13 @@ services:
   bionic:
     << : *linux
     hostname: bionic
-    image: ${DOCKER_USER:-qbsbuild}/qbsdev:bionic-5.12.5_1.14.0-1
+    image: ${DOCKER_USER:-qbsbuild}/qbsdev:bionic-5.12.6_1.14.1-0
     build:
       dockerfile: docker/bionic/Dockerfile
       context: .
       args:
-        QT_VERSION: 5.12.5
-        QTCREATOR_VERSION: 4.10.1
+        QT_VERSION: 5.12.6
+        QTCREATOR_VERSION: 4.10.2
 
   stretch:
     << : *linux
-- 
cgit v1.2.3