diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 7208620..9a71334 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -20,6 +20,7 @@ Changed ------- * Update Security policy * Update combinations.json(#566) +* CI: now test on MacOS 12(#541) `v2.2.3`_ (17, Aug. 2022) ------------------------- diff --git a/README.rst b/README.rst index ee7df4f..01615c3 100644 --- a/README.rst +++ b/README.rst @@ -147,6 +147,12 @@ To install Qt 6.2.0 with the modules 'qtcharts' and 'qtnetworking', you can use aqt install-qt windows desktop 6.2.0 win64_mingw81 -m qtcharts qtnetworking +When you want to install Qt for android with required desktop toolsets + +.. code-block:: console + + aqt install-qt linux android 5.13.2 android_armv7 --autodesktop + When aqtinstall downloads and installs packages, it updates package configurations such as prefix directory in ``bin/qt.conf``, and ``bin/qconfig.pri`` diff --git a/docs/authors.rst b/docs/authors.rst index bddf134..efc9aa9 100644 --- a/docs/authors.rst +++ b/docs/authors.rst @@ -18,7 +18,7 @@ All contributors, listed alphabetically, are: * Aurélien Gâteau (patching to qmake) * Benjamin O (Github Actions and more) * Christian Hoffmann (Update mirror list) -* David Dalcino (Many improvements on CI automations, List commands, tests, documents and so on) +* David Dalcino (Many improvements on CI automations, commands, tests, documents and so on) * Doronin Stanislav (document) * Fabrice Le Bars (32bit binary) * Felix Barz (Android, Explicit extra module installation) diff --git a/docs/cli.rst b/docs/cli.rst index 96d1aa4..7c66bf0 100644 --- a/docs/cli.rst +++ b/docs/cli.rst @@ -804,12 +804,12 @@ Command examples .. program:: None -Example: Installing Qt SDK 5.12.0 for Linux with QtCharts and QtNetworkAuth: +Example: Installing Qt SDK 5.12.12 for Linux with QtCharts and QtNetworkAuth: .. code-block:: console pip install aqtinstall - sudo aqt install-qt --outputdir /opt linux desktop 5.12.0 -m qtcharts qtnetworkauth + sudo aqt install-qt --outputdir /opt linux desktop 5.12.12 -m qtcharts qtnetworkauth Example: Installing the newest LTS version of Qt 5.12: @@ -820,11 +820,11 @@ Example: Installing the newest LTS version of Qt 5.12: sudo aqt install-qt linux desktop 5.12 win64_mingw73 -Example: Installing Android (armv7) Qt 5.10.2: +Example: Installing Android (armv7) Qt 5.13.2: .. code-block:: console - aqt install-qt linux android 5.10.2 android_armv7 --autodesktop + aqt install-qt linux android 5.13.2 android_armv7 --autodesktop Example: Install examples, doc and source: