Skip to content

Commit a8a2699

Browse files
committed
Update aqt to use install-qt rather than install.
1 parent 4af517c commit a8a2699

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

tools/ci/for_pip/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
aqtinstall==1.2.3
1+
aqtinstall==2.0.6

tools/ci/get_qt_libs.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ else
3434

3535
if [[ -n ${MYAPP_TEMPLATE_QT6-} ]]; then
3636
# https://github.com/miurahr/aqtinstall/issues/126 "Installing smaller subset of the libraries"
37-
python3 -m aqt install --base "${QTSIXMIRROR}" --outputdir $DL_FOLDER/Qt_desktop 6.0.0 linux desktop --archives \
37+
python3 -m aqt install-qt --base "${QTSIXMIRROR}" --outputdir $DL_FOLDER/Qt_desktop linux desktop 6.0.0 --archives \
3838
icu \
3939
qtbase \
4040
qtconnectivity \
@@ -48,12 +48,12 @@ else
4848

4949
# we still need qt5 in order to execute qmlfmt. (until we can recompile qmlfmt with qt6)
5050
# https://github.com/miurahr/aqtinstall/issues/126 "Installing smaller subset of the libraries"
51-
python3 -m aqt install --base "${QTMIRROR}" --outputdir $DL_FOLDER/Qt_desktop 5.15.0 linux desktop --archives \
51+
python3 -m aqt install-qt --base "${QTMIRROR}" --outputdir $DL_FOLDER/Qt_desktop linux desktop 5.15.0 --archives \
5252
icu \
5353
qtbase
5454
else
5555
# https://github.com/miurahr/aqtinstall/issues/126 "Installing smaller subset of the libraries"
56-
python3 -m aqt install --base "${QTMIRROR}" --outputdir $DL_FOLDER/Qt_desktop 5.15.0 linux desktop --archives \
56+
python3 -m aqt install-qt --base "${QTMIRROR}" --outputdir $DL_FOLDER/Qt_desktop linux desktop 5.15.0 --archives \
5757
icu \
5858
qtbase \
5959
qtconnectivity \

tools/ci/provision_win.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@ pip3 install -r ${DIR}/for_pip/requirements.txt # https://github.com/miurahr/aq
1212
# NOTE: as of Nov 23, 2020, it is not clear whether 'win64_msvc2019_64' is the right ARCH
1313
# argument to pass to aqtinstall. We may need to try other options:
1414
# win64_msvc2017_64, win64_msvc2019_winrt_x64 ?
15+
# FURTHER: as of Feb 11, 2022, this is untested on windows after switching from install to install-qt
1516
# Refer to: https://github.com/miurahr/aqtinstall#usage
1617

1718
# https://github.com/miurahr/aqtinstall/issues/126 "Installing smaller subset of the libraries"
18-
python -m aqt install --outputdir $DL_FOLDER/Qt_desktop 5.15.0 windows desktop win64_msvc2019_64 --archives \
19+
python -m aqt install-qt --outputdir $DL_FOLDER/Qt_desktop windows desktop 5.15.0 win64_msvc2019_64 --archives \
1920
icu \
2021
qtbase \
2122
qtconnectivity \

0 commit comments

Comments
 (0)