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/focal/test-android.Dockerfile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'docker') diff --git a/docker/focal/test-android.Dockerfile b/docker/focal/test-android.Dockerfile index a012f504f..8ded72c37 100644 --- a/docker/focal/test-android.Dockerfile +++ b/docker/focal/test-android.Dockerfile @@ -101,12 +101,18 @@ USER root # ARG QT_VERSION COPY scripts/install-qt.sh install-qt.sh -RUN if [ "${QT_VERSION}" \< "5.14" ]; then \ +RUN if [ "${QT_VERSION}" \< "5.14" ] || [ ! "${QT_VERSION}" \< "6.0.0" ]; then \ QT_ABIS="android_armv7 android_arm64_v8a android_x86 android_x86_64"; \ else \ QT_ABIS="any"; \ fi; \ + if [ ! "${QT_VERSION}" \< "6.0.0" ]; then \ + ./install-qt.sh --version ${QT_VERSION} qtbase qtdeclarative icu; \ + QT_COMPONENTS="qtbase qtdeclarative qttools qtquickcontrols2 qtquicktimeline"; \ + else \ + QT_COMPONENTS="qtbase qtdeclarative qttools qtimageformats"; \ + fi; \ for abi in ${QT_ABIS}; do \ - ./install-qt.sh --version ${QT_VERSION} --target android --toolchain ${abi} qtbase qtdeclarative qttools qtimageformats; \ + ./install-qt.sh --version ${QT_VERSION} --target android --toolchain ${abi} ${QT_COMPONENTS}; \ done && \ echo "export QT_VERSION=${QT_VERSION}" >> /etc/profile.d/qt.sh -- cgit v1.2.1