Mirrors/aqtinstall
1
0
Fork 0
mirror of https://github.com/miurahr/aqtinstall.git synced 2025-12-18 05:04:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into add-tutorial

Browse Source
This commit is contained in:
David Dalcino
2021-07-27 16:38:26 -07:00
parent ad8cceaaa3 7484b1ba2b
commit 89a4f147dd
14 changed files with 1045 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/check-combinations.yml vendored
View File

@@ -44,7 +44,7 @@ jobs:
The `ci/generate_combinations.py` script has detected changes to the repo at https://download.qt.io.
This PR will update `aqt/combinations.json` to account for those changes.
Posted from [the `check_combinations` action](https://github.com/${{ env.GITHUB_REPOSITORY }}/actions/runs/${{ env.GITHUB_RUN_ID }})
Posted from [the `check_combinations` action](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})
branch: "update-combinations"
path: "aqt/combinations.json"

10
CHANGELOG.rst
View File

@@ -10,6 +10,9 @@ All notable changes to this project will be documented in this file.
Added
-----
* Add error messages when user inputs an invalid semantic version(#291)
* Security Policy document
* CI: CodeQL static source analysis
* CI: generate combination json in actions (#318,#343)
Changed
-------
@@ -20,6 +23,11 @@ Changed
* Change log format for logging file.
* Extension validation for tool subcommand(#314)
* list subcommand has --tool-long option(#304, #319)
* tool subcommand now install without version spec(#299)
* README example command is now easy to copy-and-paste(#322)
* list subcommand update(#331)
* Improve handle of Ctrl-C keyboard interrption(#337)
* Update combinations.json(#344)
Fixed
-----
@@ -27,6 +35,8 @@ Fixed
* Fix Qt 6.2.0 target path for macOS.(#289)
* Fix WinRT installation patching(#311)
* Fix Qt 5.9.0 installation (#312)
* Link documentations for stable/latest on README
`v1.2.2`_ (1, Jul. 2021)
========================

4
README.rst
View File

@@ -111,6 +111,10 @@ General usage looks like this:
You can also call with ``python -m aqt`` syntax as well as command script ``aqt``.
Many older Linux distributions symlink ``python`` to the older Python 2.7, which is incompatible with ``aqt``.
If you are using such a system, please check your Python 3 version with ``python3 --version``,
and run ``aqt`` using ``python3 -m aqt``.
* The Qt version is formatted like this: `5.11.3`
* Host is one of: `linux`, `mac`, `windows`
* Target is one of: `desktop`, `android`, `ios` (iOS only works with mac host)

2
SECURITY.rst
View File

@@ -4,8 +4,6 @@ Security Policy
Supported Versions
------------------
Only recent version of pyppmd are currently being supported with security updates.
+---------+--------------------+
| Version | Status |
+=========+====================+

3
aqt/__main__.py
View File

@@ -24,4 +24,7 @@ import sys
from . import main
if __name__ == "__main__":
if sys.version_info[0] == "2":
print("aqtinstall requires python 3!")
sys.exit(1)
sys.exit(main())

977
aqt/combinations.json
View File

@@ -1,112 +1,867 @@
[{"qt": [
{"os_name": "linux", "target": "desktop", "arch": "gcc_64"},
{"os_name": "linux", "target": "desktop", "arch": "wasm_32"},
{"os_name": "linux", "target": "android", "arch": "android"},
{"os_name": "linux", "target": "android", "arch": "android_x86_64"},
{"os_name": "linux", "target": "android", "arch": "android_arm64_v8a"},
{"os_name": "linux", "target": "android", "arch": "android_x86"},
{"os_name": "linux", "target": "android", "arch": "android_armv7"},
{"os_name": "mac", "target": "desktop", "arch": "clang_64"},
{"os_name": "mac", "target": "desktop", "arch": "wasm_32"},
{"os_name": "mac", "target": "ios", "arch": "ios"},
{"os_name": "mac", "target": "android", "arch": "android"},
{"os_name": "windows", "target": "desktop", "arch": "win64_msvc2019_64"},
{"os_name": "windows", "target": "desktop", "arch": "win32_msvc2019"},
{"os_name": "windows", "target": "desktop", "arch": "win64_msvc2017_64"},
{"os_name": "windows", "target": "desktop", "arch": "win32_msvc2017"},
{"os_name": "windows", "target": "desktop", "arch": "win64_msvc2015_64"},
{"os_name": "windows", "target": "desktop", "arch": "win32_msvc2015"},
{"os_name": "windows", "target": "desktop", "arch": "win64_mingw81"},
{"os_name": "windows", "target": "desktop", "arch": "win32_mingw81"},
{"os_name": "windows", "target": "desktop", "arch": "win64_mingw73"},
{"os_name": "windows", "target": "desktop", "arch": "win32_mingw73"},
{"os_name": "windows", "target": "desktop", "arch": "win32_mingw53"},
{"os_name": "windows", "target": "winrt", "arch": "win64_msvc2019_winrt_x64"},
{"os_name": "windows", "target": "winrt", "arch": "win64_msvc2019_winrt_x86"},
{"os_name": "windows", "target": "winrt", "arch": "win64_msvc2019_winrt_armv7"},
{"os_name": "windows", "target": "winrt", "arch": "win64_msvc2017_winrt_x64"},
{"os_name": "windows", "target": "winrt", "arch": "win64_msvc2017_winrt_x86"},
{"os_name": "windows", "target": "winrt", "arch": "win64_msvc2017_winrt_armv7"},
{"os_name": "windows", "target": "winrt", "arch": "win64_msvc2015_winrt_x64"},
{"os_name": "windows", "target": "winrt", "arch": "win64_msvc2015_winrt_armv7"},
{"os_name": "windows", "target": "desktop", "arch": "wasm_32"},
{"os_name": "windows", "target": "android", "arch": "android"},
{"os_name": "windows", "target": "android", "arch": "android_x86_64"},
{"os_name": "windows", "target": "android", "arch": "android_arm64_v8a"},
{"os_name": "windows", "target": "android", "arch": "android_x86"},
{"os_name": "windows", "target": "android", "arch": "android_armv7"}
], "tools": [
{"os_name": "linux", "target": "desktop", "tool_name": "tools_ifw", "arch": "qt.tools.ifw.40"},
{"os_name": "linux", "target": "desktop", "tool_name": "tools_maintainance", "arch": "qt.tools.maintainance"},
{"os_name": "linux", "target": "desktop", "tool_name": "tools_qt3dstudio", "arch": "qt.tools.qt3dstudio"},
{"os_name": "linux", "target": "desktop", "tool_name": "tools_qtcreator", "arch": "qt.tools.qtcreator"},
{"os_name": "linux", "target": "desktop", "tool_name": "tools_telemetry", "arch": "qt.tools.qtcreator.telemetry"},
{"os_name": "linux", "target": "desktop", "tool_name": "tools_openssl_x64", "arch":"qt.tools.openssl.gcc_64"},
{"os_name": "linux", "target": "desktop", "tool_name": "tools_openssl_src", "arch":"qt.tools.openssl"},
{"os_name": "mac", "target": "desktop", "tool_name": "tools_ifw", "arch": "qt.tools.ifw.40"},
{"os_name": "mac", "target": "desktop", "tool_name": "tools_maintainance", "arch": "qt.tools.maintainance"},
{"os_name": "mac", "target": "desktop", "tool_name": "tools_qt3dstudio", "arch": "qt.tools.qt3dstudio"},
{"os_name": "mac", "target": "desktop", "tool_name": "tools_qtcreator", "arch": "qt.tools.qtcreator"},
{"os_name": "mac", "target": "desktop", "tool_name": "tools_telemetry", "arch": "qt.tools.qtcreator.telemetry"},
{"os_name": "windows", "target": "desktop", "tool_name": "tools_openssl_x64", "arch": "qt.tools.openssl.win_x64"},
{"os_name": "windows", "target": "desktop", "tool_name": "tools_openssl_x86", "arch": "qt.tools.openssl.win_x86"},
{"os_name": "windows", "target": "desktop", "tool_name": "tools_vcredist", "arch": "qt.tools.vcredist_msvc2019_x64"},
{"os_name": "windows", "target": "desktop", "tool_name": "tools_vcredist", "arch": "qt.tools.vcredist_msvc2019_x86"},
{"os_name": "windows", "target": "desktop", "tool_name": "tools_vcredist", "arch": "qt.tools.vcredist_msvc2017_x64"},
{"os_name": "windows", "target": "desktop", "tool_name": "tools_vcredist", "arch": "qt.tools.vcredist_msvc2017_x86"},
{"os_name": "windows", "target": "desktop", "tool_name": "tools_vcredist", "arch": "qt.tools.vcredist_msvc2015_x64"},
{"os_name": "windows", "target": "desktop", "tool_name": "tools_vcredist", "arch": "qt.tools.vcredist_msvc2015_x86"},
{"os_name": "windows", "target": "desktop", "tool_name": "tools_vcredist", "arch": "qt.tools.vcredist_msvc2013_x64"},
{"os_name": "windows", "target": "desktop", "tool_name": "tools_vcredist", "arch": "qt.tools.vcredist_msvc2013_x86"},
{"os_name": "windows", "target": "desktop", "tool_name": "tools_vcredist", "arch": "qt.tools.vcredist_64"},
{"os_name": "windows", "target": "desktop", "tool_name": "tools_vcredist", "arch": "qt.tools.vcredist"},
{"os_name": "windows", "target": "desktop", "tool_name": "tools_ifw", "arch": "qt.tools.ifw.40"},
{"os_name": "windows", "target": "desktop", "tool_name": "tools_mingw", "arch": "qt.tools.win64_mingw810"},
{"os_name": "windows", "target": "desktop", "tool_name": "tools_mingw", "arch": "qt.tools.win32_mingw810"},
{"os_name": "windows", "target": "desktop", "tool_name": "tools_mingw", "arch": "qt.tools.win64_mingw730"},
{"os_name": "windows", "target": "desktop", "tool_name": "tools_mingw", "arch": "qt.tools.win32_mingw730"},
{"os_name": "windows", "target": "desktop", "tool_name": "tools_mingw", "arch": "qt.tools.win32_mingw530"},
{"os_name": "windows", "target": "desktop", "tool_name": "tools_mingw", "arch": "qt.tools.win32_mingw492"},
{"os_name": "windows", "target": "desktop", "tool_name": "tools_mingw", "arch": "qt.tools.win32_mingw491"},
{"os_name": "windows", "target": "desktop", "tool_name": "tools_mingw", "arch": "qt.tools.win32_mingw482"},
{"os_name": "windows", "target": "desktop", "tool_name": "tools_mingw", "arch": "qt.tools.win32_mingw48"},
{"os_name": "windows", "target": "desktop", "tool_name": "tools_mingw", "arch": "qt.tools.mingw47"},
{"os_name": "windows", "target": "desktop", "tool_name": "tools_maintainance", "arch": "qt.tools.maintainance"},
{"os_name": "windows", "target": "desktop", "tool_name": "tools_qtcreator", "arch": "qt.tools.qtcreator"},
{"os_name": "windows", "target": "desktop", "tool_name": "tools_qt3dstudio", "arch": "qt.tools.qt3dstudio"},
{"os_name": "windows", "target": "desktop", "tool_name": "tools_telemetry", "arch": "qt.tools.qtcreator.telemetry"}
], "modules": [
{"qt_version": "5.9", "modules": ["qtcharts", "qtnetworkauth", "qtpurchasing", "qtdatavis3d", "qtremoteobjects",
"qtscript", "qtspeech", "qtvirtualkeyboard", "qtwebengine"]},
{"qt_version": "5.10", "modules": ["qtcharts", "qtnetworkauth", "qtpurchasing", "qtdatavis3d", "qtremoteobjects",
"qtscript", "qtvirtualkeyboard", "qtwebengine", "qtwebglplugin"]},
{"qt_version": "5.11", "modules": ["qtcharts", "qtnetworkauth", "qtpurchasing", "qtdatavis3d", "qtremoteobjects",
"qtscript", "qtvirtualkeyboard", "qtwebengine","qtwebglplugin"]},
{"qt_version": "5.12", "modules": ["qtcharts", "qtnetworkauth", "qtpurchasing", "qtdatavis3d",
"qtscript", "qtvirtualkeyboard", "qtwebengine","qtwebglplugin"]},
{"qt_version": "5.13", "modules": ["qtcharts", "qtlottie", "qtnetworkauth", "qtpurchasing", "qtdatavis3d",
"qtquicktimeline", "qtscript", "qtvirtualkeyboard", "qtwebengine", "qtwebglplugin"]},
{"qt_version": "5.14", "modules": ["qtcharts", "qtlottie", "qtnetworkauth", "qtpurchasing", "qtdatavis3d",
"qtquick3d", "qtquicktimeline", "qtscript", "qtvirtualkeyboard", "qtwebengine", "qtwebglplugin"]},
{"qt_version": "5.15", "modules": ["qtcharts", "qtlottie", "qtnetworkauth", "qtpurchasing", "qtdatavis3d",
"qtquick3d", "qtquicktimeline", "qtscript", "qtvirtualkeyboard", "qtwebengine", "qtwebglplugin"]},
{"qt_version": "6.0", "modules": ["qtwaylandcompositor", "qtshadertools", "qtquicktimeline", "qtquick3d",
"qt5compat"]},
{"qt_version": "6.1", "modules": ["qtwaylandcompositor", "qtshadertools", "qtquicktimeline", "qtquick3d",
"qt5compat"]},
{"qt_version": "6.2", "modules": ["qtwaylandcompositor", "qtshadertools", "qtquicktimeline", "qtquick3d",
"qt5compat"]}
], "versions": [
"5.9", "5.9.1", "5.9.2", "5.9.3", "5.9.4", "5.9.5", "5.9.6", "5.9.7", "5.9.8", "5.9.9",
"5.10.0", "5.10.1", "5.11.0", "5.11.1", "5.11.2", "5.11.3",
"5.12.0", "5.12.1", "5.12.2", "5.12.3", "5.12.4", "5.12.5", "5.12.6", "5.12.7", "5.12.8", "5.12.9", "5.12.10", "5.12.11",
"5.13.0", "5.13.1", "5.13.2",
"5.14.0", "5.14.1", "5.14.2",
"5.15.0", "5.15.1", "5.15.2",
"6.0.0", "6.0.1", "6.0.2", "6.0.3", "6.0.4", "6.1.0", "6.1.1", "6.2.0"
], "new_archive": [
"5.1.0", "5.2", "5.3.0", "5.3.1", "5.3.2", "5.4.0", "5.4.1", "5.4.2",
"5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.6.2", "5.6.3",
"5.7.0", "5.7.1", "5.8.0"
[
{
"modules": [
{
"modules": [
"qtcharts",
"qtdatavis3d",
"qtnetworkauth",
"qtpurchasing",
"qtremoteobjects",
"qtscript",
"qtspeech",
"qtvirtualkeyboard",
"qtwebengine"
],
"qt_version": "5.9"
},
{
"modules": [
"qtcharts",
"qtdatavis3d",
"qtnetworkauth",
"qtpurchasing",
"qtremoteobjects",
"qtscript",
"qtvirtualkeyboard",
"qtwebengine",
"qtwebglplugin"
],
"qt_version": "5.10"
},
{
"modules": [
"qtcharts",
"qtdatavis3d",
"qtnetworkauth",
"qtpurchasing",
"qtremoteobjects",
"qtscript",
"qtvirtualkeyboard",
"qtwebengine",
"qtwebglplugin"
],
"qt_version": "5.11"
},
{
"modules": [
"debug_info",
"qtcharts",
"qtdatavis3d",
"qtnetworkauth",
"qtpurchasing",
"qtscript",
"qtvirtualkeyboard",
"qtwebengine",
"qtwebglplugin"
],
"qt_version": "5.12"
},
{
"modules": [
"debug_info",
"qtcharts",
"qtdatavis3d",
"qtlottie",
"qtnetworkauth",
"qtpurchasing",
"qtscript",
"qtvirtualkeyboard",
"qtwebengine",
"qtwebglplugin"
],
"qt_version": "5.13"
},
{
"modules": [
"debug_info",
"qtcharts",
"qtdatavis3d",
"qtlottie",
"qtnetworkauth",
"qtpurchasing",
"qtquick3d",
"qtquicktimeline",
"qtscript",
"qtvirtualkeyboard",
"qtwaylandcompositor",
"qtwebengine",
"qtwebglplugin"
],
"qt_version": "5.14"
},
{
"modules": [
"debug_info",
"qtcharts",
"qtdatavis3d",
"qtlottie",
"qtnetworkauth",
"qtpurchasing",
"qtquick3d",
"qtquicktimeline",
"qtscript",
"qtvirtualkeyboard",
"qtwaylandcompositor",
"qtwebengine",
"qtwebglplugin"
],
"qt_version": "5.15"
},
{
"modules": [
"debug_info",
"qt5compat",
"qtquick3d",
"qtquicktimeline",
"qtshadertools",
"qtwaylandcompositor"
],
"qt_version": "6.0"
},
{
"modules": [
"addons.qt3d",
"addons.qtcharts",
"addons.qtdatavis3d",
"addons.qtimageformats",
"addons.qtlottie",
"addons.qtnetworkauth",
"addons.qtscxml",
"addons.qtvirtualkeyboard",
"debug_info",
"qt5compat",
"qtquick3d",
"qtquicktimeline",
"qtshadertools",
"qtwaylandcompositor"
],
"qt_version": "6.1"
},
{
"modules": [
"addons.qt3d",
"addons.qtcharts",
"addons.qtconnectivity",
"addons.qtdatavis3d",
"addons.qtimageformats",
"addons.qtlottie",
"addons.qtmultimedia",
"addons.qtnetworkauth",
"addons.qtpositioning",
"addons.qtremoteobjects",
"addons.qtscxml",
"addons.qtsensors",
"addons.qtserialbus",
"addons.qtserialport",
"addons.qtvirtualkeyboard",
"addons.qtwebchannel",
"addons.qtwebengine",
"addons.qtwebsockets",
"addons.qtwebview",
"debug_info",
"qt5compat",
"qtquick3d",
"qtquicktimeline",
"qtshadertools",
"qtwaylandcompositor"
],
"qt_version": "6.2"
}
],
"new_archive": [
"5.1.0",
"5.2",
"5.3.0",
"5.3.1",
"5.3.2",
"5.4.0",
"5.4.1",
"5.4.2",
"5.5.0",
"5.5.1",
"5.6.0",
"5.6.1",
"5.6.2",
"5.6.3",
"5.7.0",
"5.7.1",
"5.8.0"
],
"qt": [
{
"arch": "android",
"os_name": "linux",
"target": "android"
},
{
"arch": "android_arm64_v8a",
"os_name": "linux",
"target": "android"
},
{
"arch": "android_armv7",
"os_name": "linux",
"target": "android"
},
{
"arch": "android_x86",
"os_name": "linux",
"target": "android"
},
{
"arch": "android_x86_64",
"os_name": "linux",
"target": "android"
},
{
"arch": "gcc_64",
"os_name": "linux",
"target": "desktop"
},
{
"arch": "wasm_32",
"os_name": "linux",
"target": "desktop"
},
{
"arch": "android",
"os_name": "mac",
"target": "android"
},
{
"arch": "android_arm64_v8a",
"os_name": "mac",
"target": "android"
},
{
"arch": "android_armv7",
"os_name": "mac",
"target": "android"
},
{
"arch": "android_x86",
"os_name": "mac",
"target": "android"
},
{
"arch": "android_x86_64",
"os_name": "mac",
"target": "android"
},
{
"arch": "clang_64",
"os_name": "mac",
"target": "desktop"
},
{
"arch": "wasm_32",
"os_name": "mac",
"target": "desktop"
},
{
"arch": "ios",
"os_name": "mac",
"target": "ios"
},
{
"arch": "android",
"os_name": "windows",
"target": "android"
},
{
"arch": "android_arm64_v8a",
"os_name": "windows",
"target": "android"
},
{
"arch": "android_armv7",
"os_name": "windows",
"target": "android"
},
{
"arch": "android_x86",
"os_name": "windows",
"target": "android"
},
{
"arch": "android_x86_64",
"os_name": "windows",
"target": "android"
},
{
"arch": "wasm_32",
"os_name": "windows",
"target": "desktop"
},
{
"arch": "win32_mingw53",
"os_name": "windows",
"target": "desktop"
},
{
"arch": "win32_mingw73",
"os_name": "windows",
"target": "desktop"
},
{
"arch": "win32_mingw81",
"os_name": "windows",
"target": "desktop"
},
{
"arch": "win32_msvc2015",
"os_name": "windows",
"target": "desktop"
},
{
"arch": "win32_msvc2017",
"os_name": "windows",
"target": "desktop"
},
{
"arch": "win32_msvc2019",
"os_name": "windows",
"target": "desktop"
},
{
"arch": "win64_mingw73",
"os_name": "windows",
"target": "desktop"
},
{
"arch": "win64_mingw81",
"os_name": "windows",
"target": "desktop"
},
{
"arch": "win64_msvc2013_64",
"os_name": "windows",
"target": "desktop"
},
{
"arch": "win64_msvc2015_64",
"os_name": "windows",
"target": "desktop"
},
{
"arch": "win64_msvc2017_64",
"os_name": "windows",
"target": "desktop"
},
{
"arch": "win64_msvc2019_64",
"os_name": "windows",
"target": "desktop"
},
{
"arch": "win64_msvc2019_arm64",
"os_name": "windows",
"target": "desktop"
},
{
"arch": "win64_msvc2015_winrt_armv7",
"os_name": "windows",
"target": "winrt"
},
{
"arch": "win64_msvc2015_winrt_x64",
"os_name": "windows",
"target": "winrt"
},
{
"arch": "win64_msvc2015_winrt_x86",
"os_name": "windows",
"target": "winrt"
},
{
"arch": "win64_msvc2017_winrt_armv7",
"os_name": "windows",
"target": "winrt"
},
{
"arch": "win64_msvc2017_winrt_x64",
"os_name": "windows",
"target": "winrt"
},
{
"arch": "win64_msvc2017_winrt_x86",
"os_name": "windows",
"target": "winrt"
},
{
"arch": "win64_msvc2019_winrt_armv7",
"os_name": "windows",
"target": "winrt"
},
{
"arch": "win64_msvc2019_winrt_x64",
"os_name": "windows",
"target": "winrt"
},
{
"arch": "win64_msvc2019_winrt_x86",
"os_name": "windows",
"target": "winrt"
}
],
"tools": [
{
"arch": "qt.tools.cmake",
"os_name": "linux",
"target": "desktop",
"tool_name": "tools_cmake"
},
{
"arch": "qt.tools.conan",
"os_name": "linux",
"target": "desktop",
"tool_name": "tools_conan"
},
{
"arch": "qt.tools.conan.cmake",
"os_name": "linux",
"target": "desktop",
"tool_name": "tools_conan"
},
{
"arch": "qt.tools.sdktools.doc",
"os_name": "linux",
"target": "desktop",
"tool_name": "tools_generic"
},
{
"arch": "qt.tools.ifw.41",
"os_name": "linux",
"target": "desktop",
"tool_name": "tools_ifw"
},
{
"arch": "qt.tools.maintenance",
"os_name": "linux",
"target": "desktop",
"tool_name": "tools_maintenance"
},
{
"arch": "qt.tools.ninja",
"os_name": "linux",
"target": "desktop",
"tool_name": "tools_ninja"
},
{
"arch": "qt.tools.openssl.src",
"os_name": "linux",
"target": "desktop",
"tool_name": "tools_openssl_src"
},
{
"arch": "qt.tools.openssl.gcc_64",
"os_name": "linux",
"target": "desktop",
"tool_name": "tools_openssl_x64"
},
{
"arch": "qt.tools.qt3dstudio",
"os_name": "linux",
"target": "desktop",
"tool_name": "tools_qt3dstudio"
},
{
"arch": "qt.tools.qtcreator",
"os_name": "linux",
"target": "desktop",
"tool_name": "tools_qtcreator"
},
{
"arch": "qt.tools.qtcreator.src",
"os_name": "linux",
"target": "desktop",
"tool_name": "tools_qtcreator"
},
{
"arch": "qt.tools.qtcreatordbg",
"os_name": "linux",
"target": "desktop",
"tool_name": "tools_qtcreator"
},
{
"arch": "qt.tools.qtcreatordev",
"os_name": "linux",
"target": "desktop",
"tool_name": "tools_qtcreator"
},
{
"arch": "qt.tools.qtdesignstudio",
"os_name": "linux",
"target": "desktop",
"tool_name": "tools_qtdesignstudio"
},
{
"arch": "qt.tools.qtcreator.telemetry",
"os_name": "linux",
"target": "desktop",
"tool_name": "tools_telemetry"
},
{
"arch": "qt.tools.cmake",
"os_name": "mac",
"target": "desktop",
"tool_name": "tools_cmake"
},
{
"arch": "qt.tools.conan",
"os_name": "mac",
"target": "desktop",
"tool_name": "tools_conan"
},
{
"arch": "qt.tools.conan.cmake",
"os_name": "mac",
"target": "desktop",
"tool_name": "tools_conan"
},
{
"arch": "qt.tools.sdktools.doc",
"os_name": "mac",
"target": "desktop",
"tool_name": "tools_generic"
},
{
"arch": "qt.tools.ifw.41",
"os_name": "mac",
"target": "desktop",
"tool_name": "tools_ifw"
},
{
"arch": "qt.tools.maintenance",
"os_name": "mac",
"target": "desktop",
"tool_name": "tools_maintenance"
},
{
"arch": "qt.tools.ninja",
"os_name": "mac",
"target": "desktop",
"tool_name": "tools_ninja"
},
{
"arch": "qt.tools.qt3dstudio",
"os_name": "mac",
"target": "desktop",
"tool_name": "tools_qt3dstudio"
},
{
"arch": "qt.tools.qtcreator",
"os_name": "mac",
"target": "desktop",
"tool_name": "tools_qtcreator"
},
{
"arch": "qt.tools.qtcreatordbg",
"os_name": "mac",
"target": "desktop",
"tool_name": "tools_qtcreator"
},
{
"arch": "qt.tools.qtcreatordev",
"os_name": "mac",
"target": "desktop",
"tool_name": "tools_qtcreator"
},
{
"arch": "qt.tools.qtdesignstudio",
"os_name": "mac",
"target": "desktop",
"tool_name": "tools_qtdesignstudio"
},
{
"arch": "qt.tools.qtcreator.telemetry",
"os_name": "mac",
"target": "desktop",
"tool_name": "tools_telemetry"
},
{
"arch": "qt.tools.cmake.win32",
"os_name": "windows",
"target": "desktop",
"tool_name": "tools_cmake"
},
{
"arch": "qt.tools.cmake.win64",
"os_name": "windows",
"target": "desktop",
"tool_name": "tools_cmake"
},
{
"arch": "qt.tools.conan",
"os_name": "windows",
"target": "desktop",
"tool_name": "tools_conan"
},
{
"arch": "qt.tools.conan.cmake",
"os_name": "windows",
"target": "desktop",
"tool_name": "tools_conan"
},
{
"arch": "qt.tools.sdktools.doc",
"os_name": "windows",
"target": "desktop",
"tool_name": "tools_generic"
},
{
"arch": "qt.tools.ifw.41",
"os_name": "windows",
"target": "desktop",
"tool_name": "tools_ifw"
},
{
"arch": "qt.tools.maintenance",
"os_name": "windows",
"target": "desktop",
"tool_name": "tools_maintenance"
},
{
"arch": "qt.tools.mingw47",
"os_name": "windows",
"target": "desktop",
"tool_name": "tools_mingw"
},
{
"arch": "qt.tools.win32_mingw48",
"os_name": "windows",
"target": "desktop",
"tool_name": "tools_mingw"
},
{
"arch": "qt.tools.win32_mingw482",
"os_name": "windows",
"target": "desktop",
"tool_name": "tools_mingw"
},
{
"arch": "qt.tools.win32_mingw491",
"os_name": "windows",
"target": "desktop",
"tool_name": "tools_mingw"
},
{
"arch": "qt.tools.win32_mingw492",
"os_name": "windows",
"target": "desktop",
"tool_name": "tools_mingw"
},
{
"arch": "qt.tools.win32_mingw530",
"os_name": "windows",
"target": "desktop",
"tool_name": "tools_mingw"
},
{
"arch": "qt.tools.win32_mingw730",
"os_name": "windows",
"target": "desktop",
"tool_name": "tools_mingw"
},
{
"arch": "qt.tools.win32_mingw810",
"os_name": "windows",
"target": "desktop",
"tool_name": "tools_mingw"
},
{
"arch": "qt.tools.win64_mingw730",
"os_name": "windows",
"target": "desktop",
"tool_name": "tools_mingw"
},
{
"arch": "qt.tools.win64_mingw810",
"os_name": "windows",
"target": "desktop",
"tool_name": "tools_mingw"
},
{
"arch": "qt.tools.ninja",
"os_name": "windows",
"target": "desktop",
"tool_name": "tools_ninja"
},
{
"arch": "qt.tools.openssl.src",
"os_name": "windows",
"target": "desktop",
"tool_name": "tools_openssl_src"
},
{
"arch": "qt.tools.openssl.win_x64",
"os_name": "windows",
"target": "desktop",
"tool_name": "tools_openssl_x64"
},
{
"arch": "qt.tools.openssl.win_x86",
"os_name": "windows",
"target": "desktop",
"tool_name": "tools_openssl_x86"
},
{
"arch": "qt.tools.qt3dstudio",
"os_name": "windows",
"target": "desktop",
"tool_name": "tools_qt3dstudio"
},
{
"arch": "qt.tools.qtcreator",
"os_name": "windows",
"target": "desktop",
"tool_name": "tools_qtcreator"
},
{
"arch": "qt.tools.qtcreatorcdbext",
"os_name": "windows",
"target": "desktop",
"tool_name": "tools_qtcreator"
},
{
"arch": "qt.tools.qtcreatordbg",
"os_name": "windows",
"target": "desktop",
"tool_name": "tools_qtcreator"
},
{
"arch": "qt.tools.qtcreatordev",
"os_name": "windows",
"target": "desktop",
"tool_name": "tools_qtcreator"
},
{
"arch": "qt.tools.windows_kits_debuggers",
"os_name": "windows",
"target": "desktop",
"tool_name": "tools_qtcreator"
},
{
"arch": "qt.tools.qtdesignstudio",
"os_name": "windows",
"target": "desktop",
"tool_name": "tools_qtdesignstudio"
},
{
"arch": "qt.tools.qtcreator.telemetry",
"os_name": "windows",
"target": "desktop",
"tool_name": "tools_telemetry"
},
{
"arch": "qt.tools.vcredist",
"os_name": "windows",
"target": "desktop",
"tool_name": "tools_vcredist"
},
{
"arch": "qt.tools.vcredist_msvc2015_x86",
"os_name": "windows",
"target": "desktop",
"tool_name": "tools_vcredist"
},
{
"arch": "qt.tools.vcredist_msvc2013_x64",
"os_name": "windows",
"target": "desktop",
"tool_name": "tools_vcredist"
},
{
"arch": "qt.tools.vcredist_msvc2015_x64",
"os_name": "windows",
"target": "desktop",
"tool_name": "tools_vcredist"
},
{
"arch": "qt.tools.vcredist_msvc2013_x86",
"os_name": "windows",
"target": "desktop",
"tool_name": "tools_vcredist"
},
{
"arch": "qt.tools.vcredist_msvc2017_x64",
"os_name": "windows",
"target": "desktop",
"tool_name": "tools_vcredist"
},
{
"arch": "qt.tools.vcredist_msvc2017_x86",
"os_name": "windows",
"target": "desktop",
"tool_name": "tools_vcredist"
},
{
"arch": "qt.tools.vcredist_64",
"os_name": "windows",
"target": "desktop",
"tool_name": "tools_vcredist"
},
{
"arch": "qt.tools.vcredist_msvc2019_x64",
"os_name": "windows",
"target": "desktop",
"tool_name": "tools_vcredist"
},
{
"arch": "qt.tools.vcredist_msvc2019_x86",
"os_name": "windows",
"target": "desktop",
"tool_name": "tools_vcredist"
}
],
"versions": [
"5.9.0",
"5.9.1",
"5.9.2",
"5.9.3",
"5.9.4",
"5.9.5",
"5.9.6",
"5.9.7",
"5.9.8",
"5.9.9",
"5.10.0",
"5.10.1",
"5.11.0",
"5.11.1",
"5.11.2",
"5.11.3",
"5.12.0",
"5.12.1",
"5.12.2",
"5.12.3",
"5.12.4",
"5.12.5",
"5.12.6",
"5.12.7",
"5.12.8",
"5.12.9",
"5.12.10",
"5.12.11",
"5.13.0",
"5.13.1",
"5.13.2",
"5.14.0",
"5.14.1",
"5.14.2",
"5.15.0",
"5.15.1",
"5.15.2",
"6.0.0",
"6.0.1",
"6.0.2",
"6.0.3",
"6.0.4",
"6.1.0",
"6.1.1",
"6.1.2",
"6.2.0"
]
}
]
}]

7
ci/generate_azure_pipelines_matrices.py
View File

@@ -127,7 +127,7 @@ windows_build_jobs.extend(
"desktop",
"win64_msvc2019_64",
"msvc2019_64",
module="qcharts qtnetworkauth",
module="qtcharts qtnetworkauth",
mirror=random.choice(MIRRORS),
),
]
@@ -143,7 +143,7 @@ linux_build_jobs.extend(
"desktop",
"gcc_64",
"gcc_64",
module="qcharts qtnetworkauth",
module="qtcharts qtnetworkauth",
),
BuildJob(
"install", "5.14.2", "linux", "desktop", "gcc_64", "gcc_64", module="all"
@@ -185,6 +185,7 @@ mac_build_jobs.extend(
"desktop",
"clang_64",
"macos",
module="addons.qtcharts addons.qtnetworkauth",
),
BuildJob(
"install",
@@ -193,7 +194,7 @@ mac_build_jobs.extend(
"desktop",
"clang_64",
"clang_64",
module="qcharts qtnetworkauth",
module="qtcharts qtnetworkauth",
),
]
)

51
ci/generate_combinations.py
View File

@@ -25,45 +25,43 @@ def is_blacklisted_tool(tool_name: str) -> bool:
def iter_archive_ids(
*,
categories: Iterator[str] = ArchiveId.CATEGORIES,
category: str,
hosts: Iterator[str] = ArchiveId.HOSTS,
targets: Optional[Iterator[str]] = None,
add_extensions: bool = False,
) -> Generator[ArchiveId, None, None]:
def iter_extensions() -> Generator[str, None, None]:
if add_extensions:
if cat == "qt6" and target == "android":
yield from ("x86_64", "x86", "armv7", "arm64_v8a")
if add_extensions and category == "qt":
if target == "android":
yield from ("", "x86_64", "x86", "armv7", "arm64_v8a")
return
elif cat == "qt5" and target == "desktop":
elif target == "desktop":
yield from ("wasm", "")
return
yield ""
for cat in categories:
for host in sorted(hosts):
use_targets = targets
if use_targets is None:
use_targets = ArchiveId.TARGETS_FOR_HOST[host]
for target in use_targets:
if target == "winrt" and cat == "qt6":
# there is no qt6 for winrt
continue
for ext in iter_extensions():
yield ArchiveId(cat, host, target, ext)
yield ArchiveId(category, host, target, ext)
def iter_arches() -> Generator[dict, None, None]:
logger.info("Fetching arches")
archive_ids = list(iter_archive_ids(categories=("qt5", "qt6"), add_extensions=True))
archive_ids = list(iter_archive_ids(category="qt", add_extensions=True))
for archive_id in tqdm(archive_ids):
versions = (
("latest",)
if archive_id.category == "qt6"
else ("latest", "5.13.2", "5.9.9")
)
for version in versions:
if version == "5.9.9" and archive_id.extension == "wasm":
for version in ("latest", "5.15.2", "5.13.2", "5.9.9"):
if archive_id.extension == "wasm" and (
version == "5.9.9" or version == "latest"
):
continue
if archive_id.target == "android":
if version == "latest" and archive_id.extension == "":
continue
if version != "latest" and archive_id.extension != "":
continue
for arch_name in MetadataFactory(
archive_id, architectures_ver=version
@@ -76,7 +74,7 @@ def iter_arches() -> Generator[dict, None, None]:
def iter_tool_variants() -> Generator[dict, None, None]:
for archive_id in iter_archive_ids(categories=("tools",)):
for archive_id in iter_archive_ids(category="tools"):
logger.info("Fetching tool variants for {}".format(archive_id))
for tool_name in tqdm(sorted(MetadataFactory(archive_id).getList())):
if is_blacklisted_tool(tool_name):
@@ -95,11 +93,7 @@ def iter_tool_variants() -> Generator[dict, None, None]:
def iter_qt_minor_groups(
host: str = "linux", target: str = "desktop"
) -> Generator[Tuple[int, int], None, None]:
for cat in (
"qt5",
"qt6",
):
versions: Versions = MetadataFactory(ArchiveId(cat, host, target)).getList()
versions: Versions = MetadataFactory(ArchiveId("qt", host, target)).getList()
for minor_group in versions:
v = minor_group[0]
yield v.major, v.minor
@@ -110,22 +104,17 @@ def iter_modules_for_qt_minor_groups(
) -> Generator[Dict, None, None]:
logger.info("Fetching qt modules for {}/{}".format(host, target))
for major, minor in tqdm(list(iter_qt_minor_groups(host, target))):
cat = f"qt{major}"
yield {
"qt_version": f"{major}.{minor}",
"modules": MetadataFactory(
ArchiveId(cat, host, target), modules_ver=f"{major}.{minor}.0"
ArchiveId("qt", host, target), modules_ver=f"{major}.{minor}.0"
).getList(),
}
def list_qt_versions(host: str = "linux", target: str = "desktop") -> List[str]:
all_versions = list()
for cat in (
"qt5",
"qt6",
):
versions: Versions = MetadataFactory(ArchiveId(cat, host, target)).getList()
versions: Versions = MetadataFactory(ArchiveId("qt", host, target)).getList()
for minor_group in versions:
all_versions.extend([str(ver) for ver in minor_group])
return all_versions

BIN
ci/redditclient.7z
View File

Binary file not shown.

6
ci/steps.yml
View File

@@ -143,7 +143,7 @@ steps:
Install-PackageProvider NuGet -Force
Import-PackageProvider NuGet -Force
Set-PSRepository -Name PSGallery -InstallationPolicy Trusted
Install-Module Pscx -AllowClobber
Install-Module Pscx -AllowClobber -AllowPrerelease
Install-Module VSSetup -Scope CurrentUser
if ('$(ARCH)' -like '*msvc*') {
Write-Host '##vso[task.setvariable variable=TOOLCHAIN]MSVC'
@@ -178,7 +178,6 @@ steps:
make
condition: and(eq( variables['TARGET'], 'desktop' ), ne( variables['ARCH'], 'wasm_32' ), or(eq(variables['Agent.OS'], 'Linux'), eq(variables['Agent.OS'], 'Darwin')), eq(variables['MODULE'], ''), eq(variables['SUBCOMMAND'], 'install'))
displayName: Build test with qmake for Linux and macOS w/o extra module
# TODO: current PSCX release does not support VSVER 2019
- powershell: |
if ( $env:TOOLCHAIN -eq 'MSVC' ) {
Import-VisualStudioVars -VisualStudioVersion $(VSVER) -Architecture $(ARCHITECTURE)
@@ -223,6 +222,9 @@ steps:
set -ex
mkdir $(Build.BinariesDirectory)/tests
(cd $(Build.BinariesDirectory)/tests; 7zr x $(Build.SourcesDirectory)/ci/redditclient.7z)
if [[ "6" -eq "${QT_VERSION:0:1}" ]]; then
(cd $(Build.BinariesDirectory)/tests/redditclient;patch -i redditclient_6.diff -p1)
fi
export PATH=$(QT_BINDIR):$PATH
qmake $(Build.BinariesDirectory)/tests/redditclient
make

2
docs/authors.rst
View File

@@ -14,7 +14,7 @@ Contributors, listed alphabetically, are:
* Andrei Yankovich (tools ifw installation)
* Aurélien Gâteau (patching to qmake)
* Benjamin O (Github Actions and more)
* David Dalcino (List command, improve tests and fix patching to qmake)
* David Dalcino (CI automations, List commands, improve tests and fix patching to qmake)
* Felix Barz (Android, Explicit extra module installation)
* Gamso (improve parsing of update.xml)
* Kyle Altendorf (7z binary path search)

142
docs/cli.rst
View File

@@ -9,19 +9,23 @@ long options may be truncated to the shortest unambiguous abbreviation.
Generic commands
----------------
.. program:: aqt
.. program:: help
.. option:: help
.. code-block:: bash
show generic help
aqt help
show generic help
List Qt command
------------------
.. program:: aqt
.. program:: list-qt
.. option:: list-qt [-h | --help]
.. code-block:: bash
aqt list-qt [-h | --help]
[--extension <extension>]
[--spec <specification>]
[--modules (<Qt version> | latest) |
@@ -30,7 +34,7 @@ List Qt command
--latest-version]
<target OS> [<target variant>]
List available versions of Qt, targets, extensions, modules, and architectures.
List available versions of Qt, targets, extensions, modules, and architectures.
.. describe:: target OS (aka host in code/help text)
@@ -46,9 +50,11 @@ List Qt command
Display help text
.. option:: --extension {wasm,src_doc_examples,preview,wasm_preview,x86_64,x86,armv7,arm64_v8a}
.. option:: --extension <Extension>
Extension of packages to list
{wasm,src_doc_examples,preview,wasm_preview,x86_64,x86,armv7,arm64_v8a}
Extension of packages to list.
Use the `--extensions` flag to list all relevant options for a host/target.
Incompatible with the `--extensions` flag, but may be combined with any other flag.
@@ -90,11 +96,14 @@ List Qt command
List Tool command
-----------------
.. program:: aqt
.. option:: list-tool [-h | --help] [-l | --long] <target OS> [<target variant>] [<tool name>]
.. program:: list-tool
List available tools
.. code-block:: bash
aqt list-tool [-h | --help] [-l | --long] <target OS> [<target variant>] [<tool name>]
List available tools
.. describe:: target OS (aka host in code/help text)
@@ -106,7 +115,7 @@ List Tool command
When omitted, the command prints all the targets available for a host OS.
Note that winrt is only available on Windows, and ios is only available on Mac OS.
.. describe:: <tool name>
.. describe:: tool name
The name of a tool. Use `aqt list-tool <target OS> <target variant>` to see accepted values.
When set, this prints all 'tool variant names' available.
@@ -137,15 +146,17 @@ List Tool command
Installation command
--------------------
Qt Installation command
-----------------------
.. program:: aqt
.. program:: install-qt
.. option:: install <Qt version> <target OS> <target variant> <target architecture>
.. code-block:: bash
install Qt library specified version and target.
There are various combinations to accept according to Qt version.
aqt install-qt <Qt version> <target OS> <target variant> [<target architecture>]
install Qt library specified version and target.
There are various combinations to accept according to Qt version.
.. describe:: Qt version
@@ -212,51 +223,122 @@ Installation command
Source installation command
---------------------------
.. program:: aqt
.. program:: install-src
.. option:: src <Qt version> <target OS> <target variant> [--kde] [--archives <archive>]
.. code-block:: bash
install Qt sources specified version and target. by adding --kde option,
aqt install-src <Qt version> <target OS> <target variant> [--kde] [--archives <archive>]
install Qt sources specified version and target.
.. describe:: Qt version
This is a Qt version such as 5.9,7, 5.12.1 etc
.. describe:: target OS
linux, windows or mac
.. describe:: target variant
desktop, ios or android
.. option:: --kde
by adding --kde option,
KDE patch collection is applied for qtbase tree. It is only applied to
Qt 5.15.2. When specified version is other than it, command will abort
with error when using --kde.
.. option:: --archives
You can specify --archives option to install only a specified source
such as qtbase.
Document installation command
-----------------------------
.. option:: doc <Qt version> <target OS> <target variant>
.. program:: install-doc
install Qt documents specified version and target.
.. code-block:: bash
aqt install-doc <Qt version> <target OS> <target variant>
install Qt documents specified version and target.
.. describe:: Qt version
This is a Qt version such as 5.9,7, 5.12.1 etc
.. describe:: target OS
linux, windows or mac
.. describe:: target variant
desktop, ios or android
Example installation command
----------------------------
.. option:: examples <Qt version> <target OS> <target variant>
.. program:: install-examples
install Qt examples specified version and target.
.. code-block:: bash
aqt install-examples <Qt version> <target OS> <target variant>
install Qt examples specified version and target.
.. describe:: Qt version
This is a Qt version such as 5.9,7, 5.12.1 etc
.. describe:: target OS
linux, windows or mac
.. describe:: target variant
desktop, ios or android
Tools installation command
---------------------------
.. program:: aqt
.. program:: install-tool
.. option:: tool <target OS> <target variant> <tool name> [<tool variant name>]
.. code-block:: bash
aqt install-tool <target OS> <target variant> <tool name> [<tool variant name>]
.. describe:: target OS
linux, windows or mac
.. describe:: target variant
desktop, ios or android
.. describe:: tool name
install tools specified. tool name may be 'tools_openssl_x64', 'tools_vcredist', 'tools_ninja',
'tools_ifw', 'tools_cmake'
tool variant names may be 'qt.tools.openssl.gcc_64', 'qt.tools.vcredist_msvc2013_x64'.
You may use the :ref:`List Tool command` to display what tools and tool variant names are available.
.. option:: tool variant name
Optional field to specify tool variant. It may be required for vcredist and mingw installation.
tool variant names may be 'qt.tools.win64_mingw810', 'qt.tools.vcredist_msvc2013_x64'.
You should use the :ref:`List Tool command` to display what tools and tool variant names are available.
Command examples
================
.. program:: None
Example: Installing Qt SDK 5.12.0 for Linux with QtCharts and QtNetworkAuth:

1
docs/index.rst
View File

@@ -11,7 +11,6 @@ Contents:
cli
available_versions
configuration
internals
changes
devguide
authors

40
docs/internals.rst
View File

@@ -1,40 +0,0 @@
:tocdepth: 2
.. _internals:
Internals
=========
.. _archives-objects:
Installer module
----------------
.. automodule:: aqt.installer
:members:
:inherited-members:
:show-inheritance:
Archives module
---------------
.. automodule:: aqt.archives
:members:
:inherited-members:
:show-inheritance:
Updater module
--------------
.. automodule:: aqt.updater
:members:
Helper module
-------------
.. automodule:: aqt.helper
:members: