diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2020-04-23 08:23:19 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2020-04-25 13:18:41 -0700 |
| commit | f112be7a619e93e20341d1ed92681cd8077e2798 (patch) | |
| tree | fb50aecc1f8dd5f6887ace9df60577a4bf05f629 /scripts/docker/android-build-container/setup-docker.sh | |
| parent | c0ecd3a5979ebff83089a41270e5450b60b8a131 (diff) | |
| download | subsurface-f112be7a619e93e20341d1ed92681cd8077e2798.tar.gz | |
build-system/Android: use install-qt.sh to install Qt
The official installer now requires the user to log in which we can't
really do in a scripted manner. Let's see how long this way of
installing things will be available.
While doing this remove an ancient hack of some Qt settings that we no
longer need.
This also tries to prune some things that we don't need in the Docker
image to reduce image size.
The mapbox plugin is removed as it would add a dependency to QtSql which
we otherwise don't need. And since the plugin isn't used, no point in
installing it.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'scripts/docker/android-build-container/setup-docker.sh')
| -rw-r--r-- | scripts/docker/android-build-container/setup-docker.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/docker/android-build-container/setup-docker.sh b/scripts/docker/android-build-container/setup-docker.sh index 98c13ec48..f9b9b5310 100644 --- a/scripts/docker/android-build-container/setup-docker.sh +++ b/scripts/docker/android-build-container/setup-docker.sh @@ -5,7 +5,7 @@ # copy the dependency script into this folder cp ../../../packaging/android/android-build-wrapper.sh . cp ../../../packaging/android/variables.sh . -cp ../../../packaging/android/qt-installer-noninteractive.qs . +cp ../../../packaging/android/install-qt.sh . # create the container (this takes a while) sudo docker build -t android-builder --squash . |