From e8b186610738a16fe8ddaacd39797d863828c7aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Cotty?= Date: Fri, 16 Oct 2020 22:44:41 +0200 Subject: Android: Update for Qt 6 Manage the new directory layout of Qt6. Update generation of the input file for androiddeployqt. Fixes: QBS-1613 Fixes: QBS-1609 Change-Id: Ie633fad467f310bfc4cd42e9c32d9cfc2e734582 Reviewed-by: Ivan Komissarov --- docker-compose.yml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'docker-compose.yml') diff --git a/docker-compose.yml b/docker-compose.yml index 4e8112bf9..83f629e44 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -31,7 +31,7 @@ services: focal-android-513: << : *linux hostname: focal-android - image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-android-5.13.2-0 + image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-android-5.13.2-1 build: dockerfile: docker/focal/test-android.Dockerfile context: . @@ -41,7 +41,7 @@ services: focal-android-514: << : *linux hostname: focal-android - image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-android-5.14.0-0 + image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-android-5.14.0-1 build: dockerfile: docker/focal/test-android.Dockerfile context: . @@ -51,13 +51,23 @@ services: focal-android-515: << : *linux hostname: focal-android - image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-android-5.15.1-0 + image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-android-5.15.1-1 build: dockerfile: docker/focal/test-android.Dockerfile context: . args: QT_VERSION: 5.15.1 + focal-android-600: + << : *linux + hostname: focal-android + image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-android-6.0.0-0 + build: + dockerfile: docker/focal/test-android.Dockerfile + context: . + args: + QT_VERSION: 6.0.0 + focal-baremetal: << : *linux hostname: focal-baremetal -- cgit v1.2.3