Skip to content

Android: Use aqtinstall for Qt installation #2497

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hoffie merged 1 commit into from
Mar 13, 2022
Merged

Android: Use aqtinstall for Qt installation #2497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions autobuild/android/autobuild_apk_1_prepare.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

COMMANDLINETOOLS_VERSION=6858069
ANDROID_NDK_VERSION=r21d
AQTINSTALL_VERSION=2.0.6

export DEBIAN_FRONTEND="noninteractive"
echo "::set-env name=DEBIAN_FRONTEND::${DEBIAN_FRONTEND}"
Expand Down Expand Up @@ -63,13 +64,17 @@ yes | "${ANDROID_SDKMANAGER}" --licenses


# Download / install Qt
THIS_SCRIPT=$(readlink -f "${0}")
# Absolute path this script is in, thus /home/user/bin
THIS_SCRIPT_PATH=$(dirname "${THIS_SCRIPT}")
bash "${THIS_SCRIPT_PATH}"/install-qt.sh --version "${MY_QT_VERSION}" --target android --toolchain android qtbase qtandroidextras qttools qttranslations
QT_BASEDIR="/opt/Qt"
if [[ -d "${QT_BASEDIR}" ]]; then
echo "Using Qt installation from previous run (actions/cache)"
else
echo "Install dependencies..."
python3 -m pip install "aqtinstall==${AQTINSTALL_VERSION}"
python3 -m aqt install-qt --outputdir "${QT_BASEDIR}" linux android "${MY_QT_VERSION}" --archives qtbase qttools qttranslations qtandroidextras
fi

# Set the QTDIR environment variable
export QTDIR="/opt/Qt/${MY_QT_VERSION}/android"
export QTDIR="${QT_BASEDIR}/${MY_QT_VERSION}/android"

#necessary
echo "::set-env name=QTDIR::${QTDIR}"
Expand Down
354 changes: 0 additions & 354 deletions autobuild/android/install-qt.sh
View file
Open in desktop

This file was deleted.