Skip to content

Commit

Permalink
Merge pull request #574 from miurahr/topic/miurahr/docs/update-versio…
Browse files Browse the repository at this point in the history
…n-3-0

Update documents for release 3.0.0
  • Loading branch information
miurahr authored Sep 29, 2022
2 parents d3c24d8 + 22882ce commit 14e8b65
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 8 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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)
-------------------------
Expand Down
11 changes: 8 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,9 @@ There is precise documentation with many examples.
You are recommended to read the *Getting started* section.

- Getting started: https://aqtinstall.readthedocs.io/en/latest/getting_started.html
- Stable (v2.1.x): https://aqtinstall.readthedocs.io/en/stable
- Stable (v3.0.x): https://aqtinstall.readthedocs.io/en/stable
- Latest: https://aqtinstall.readthedocs.io/en/latest
- Old (v2.0.6) : https://aqtinstall.readthedocs.io/en/v2.0.6/
- Obsolete (v1.2.5) : https://aqtinstall.readthedocs.io/en/v1.2.5/index.html
- Old (v2.2.3) : https://aqtinstall.readthedocs.io/en/v2.2.3/

Install
-------
Expand Down Expand Up @@ -147,6 +146,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``
Expand Down
2 changes: 1 addition & 1 deletion docs/authors.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions docs/cli.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down

0 comments on commit 14e8b65

Please sign in to comment.