diff options
| author | Raphaël Cotty <raphael.cotty@gmail.com> | 2020-10-16 22:44:41 +0200 |
|---|---|---|
| committer | Raphaël Cotty <raphael.cotty@gmail.com> | 2020-11-17 19:22:18 +0000 |
| commit | e8b186610738a16fe8ddaacd39797d863828c7aa (patch) | |
| tree | 1d9e2d60012739ccdfd5375b208580092ef8bc80 /docker-compose.yml | |
| parent | f4c76e08f24b48e142683cea54b4c64a75083f17 (diff) | |
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 <ABBAPOH@gmail.com>
Diffstat (limited to 'docker-compose.yml')
| -rw-r--r-- | docker-compose.yml | 16 |
1 files changed, 13 insertions, 3 deletions
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 |