Skip to content
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.

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

fix list-src,doc,examples for >= 6.8.0 #880

Merged
merged 3 commits into from
Jan 28, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 7 additions & 2 deletions aqt/metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -336,8 +336,13 @@ def to_folder(self, version: Version, qt_version_no_dots: str, extension: Option
ext="_" + extension if extension else "",
)
else:
base = f"qt{version.major}_{qt_version_no_dots}"
return f"{base}/{base}"
# traditional structure, still used by sde.
return "{category}{major}_{ver}{ext}".format(
category=self.category,
major=qt_version_no_dots[0],
ver=qt_version_no_dots,
ext="_" + extension if extension else "",
)
elif version >= Version("6.5.0") and self.target == "wasm":
# Qt 6.5-6.7 WASM uses direct wasm_[single|multi]thread folder
if extension:
Expand Down
97 changes: 97 additions & 0 deletions tests/data/all_os-681-src-doc-example-expect.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
{
"src": {
"modules": [],
"archives": [
"qt3d",
"qt5",
"qt5compat",
"qtactiveqt",
"qtbase",
"qtcharts",
"qtcoap",
"qtconnectivity",
"qtdatavis3d",
"qtdeclarative",
"qtdoc",
"qtgraphs",
"qtgrpc",
"qthttpserver",
"qtimageformats",
"qtlanguageserver",
"qtlocation",
"qtlottie",
"qtmqtt",
"qtmultimedia",
"qtnetworkauth",
"qtopcua",
"qtpositioning",
"qtquick3d",
"qtquick3dphysics",
"qtquickeffectmaker",
"qtquicktimeline",
"qtremoteobjects",
"qtscxml",
"qtsensors",
"qtserialbus",
"qtserialport",
"qtshadertools",
"qtspeech",
"qtsvg",
"qttools",
"qttranslations",
"qtvirtualkeyboard",
"qtwayland",
"qtwebchannel",
"qtwebsockets",
"qtwebview"
]
},
"doc": {
"modules": [],
"archives": [
"qdoc",
"qmake",
"qt5",
"qtassistant",
"qtcmake",
"qtconcurrent",
"qtcore",
"qtdbus",
"qtdesigner",
"qtdistancefieldgenerator",
"qtdoc",
"qtgui",
"qthelp",
"qtlabsplatform",
"qtlinguist",
"qtnetwork",
"qtopengl",
"qtplatformintegration",
"qtprintsupport",
"qtqml",
"qtqmlcore",
"qtqmlmodels",
"qtqmltest",
"qtqmlworkerscript",
"qtqmlxmllistmodel",
"qtquick",
"qtquickcontrols",
"qtquickdialogs",
"qtsql",
"qtsvg",
"qttestlib",
"qtuitools",
"qtwidgets",
"qtxml"
]
},
"examples": {
"modules": [],
"archives": [
"qtbase",
"qtdeclarative",
"qtdoc",
"qttools"
]
}
}
Loading
Loading