diff options
| author | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-05-08 21:48:46 +0200 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-05-12 13:54:47 +0000 |
| commit | 46436b9d6959f0d15c07c653884b66712ead901a (patch) | |
| tree | e0b0cdcfa41c71dd0482eab67098dda57e54de07 /docker-compose.yml | |
| parent | 6cc0df0c58a45a0407aa8f00d088f648bc71e842 (diff) | |
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>
Diffstat (limited to 'docker-compose.yml')
| -rw-r--r-- | docker-compose.yml | 6 |
1 files changed, 3 insertions, 3 deletions
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 |