diff options
| author | Raphael Cotty <raphael.cotty@gmail.com> | 2021-10-24 20:36:27 +0200 |
|---|---|---|
| committer | Raphaël Cotty <raphael.cotty@gmail.com> | 2021-10-25 05:15:47 +0000 |
| commit | eef202e5edd0a9d149433ce93105049a3e54fcf0 (patch) | |
| tree | 9ed9abd22e2435729186cf7a453498d1ba5801f5 /docker | |
| parent | 34233e45f9c3a1273f507395c8675836297fab08 (diff) | |
Android: Add android image for Qt 6.2
Change-Id: Ib48209643b755954f0f38c3f1bcfb487e23cf292
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/focal/test-android.Dockerfile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/docker/focal/test-android.Dockerfile b/docker/focal/test-android.Dockerfile index ca7223593..4f48dcf3f 100644 --- a/docker/focal/test-android.Dockerfile +++ b/docker/focal/test-android.Dockerfile @@ -115,7 +115,11 @@ RUN if [ "${QT_VERSION}" \< "5.14" ] || [ ! "${QT_VERSION}" \< "6.0.0" ]; then \ fi; \ if [ ! "${QT_VERSION}" \< "6.0.0" ]; then \ ./install-qt.sh --version ${QT_VERSION} qtbase qtdeclarative icu; \ - QT_COMPONENTS="qtbase qtdeclarative qttools qtquickcontrols2 qtquicktimeline"; \ + if [ "${QT_VERSION}" \< "6.1.0" ]; then \ + QT_COMPONENTS="qtbase qtdeclarative qttools qtquickcontrols2 qtquicktimeline svg"; \ + else \ + QT_COMPONENTS="qtbase qtdeclarative qttools qtquicktimeline svg"; \ + fi; \ else \ QT_COMPONENTS="qtbase qtdeclarative qttools qtimageformats"; \ fi; \ |