Build & generator cleanup: drop Qt5 wrapper fallbacks, switch CI to Qt 6.10, normalize macOS includes, add qmake toggles, and regenerate wrappers in CI#313
Merged
usiems merged 14 commits intoMeVisLab:masterfrom Sep 30, 2025
Conversation
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR modernizes PythonQt’s wrapper generation & build pipeline and aligns CI with Qt 6.10. It removes legacy, checked-in Qt5 wrapper directories, relies on explicit/generated paths at build time, normalizes macOS includes to bare Qt headers, adds qmake toggles for targeted builds, and updates CI to first generate wrappers then build without the generator. It also excludes a new
std::string_viewoperator introduced in Qt 6.10 that is not yet supported by the generator.Summary
Add
CONFIG+=generator_only(build just the wrapper generator).Add
CONFIG+=exclude_generator(build everything except the generator).CI
Switch "latest" pipeline from Qt 6.9 -> Qt 6.10 (workaround missing
Updates.xml.sha256for 6.9.3).Restructure jobs to:
pythonqt_generator,On macOS, generate wrappers for both Debug and Release.
Repository housekeeping
Remove stale example wrapper trees:
generated_cpp_50,generated_cpp_53,generated_cpp_54,generated_cpp_56,generated_cpp_511generated_cpp_515as the canonical example.How to build now
Preferred: generate wrappers into
../generated_cpp(relative to the build) or point qmake at an absolute path.Then build without the generator:
qmake CONFIG+=exclude_generator make -j$(nproc)If wrappers are missing, the build will fail early with a message listing searched locations and how to generate them.
Notes
std::string_viewoperator is skipped in the typesystem until binding support is implemented.