Merged
Conversation
joshanne
force-pushed
the
pr/update-to-pyqt6
branch
from
82e9c79 to
769cb5e
Compare
Member
|
Thanks! key thing is testing on MacOS and Windows |
modifies all imports from PyQt5 to PyQt6
Corrected imports for QAction
QDirModel was deprecated in Qt5 and removed in Qt6. The docs talk about QFileSystemModel being the recommended alternative.
General clean up of unused packages
When building, ensure pyqt6 is packaged.
tridge
force-pushed
the
pr/update-to-pyqt6
branch
from
fdf090c to
32534ec
Compare
tridge
previously requested changes
Mar 29, 2026
Member
tridge
left a comment
tridge
left a comment
There was a problem hiding this comment.
I think the newly added setup_mac.py would need an update for this change as it references Qt5
Drops requirement for qtwidgets and updates to PyQt6
Collaborator
Author
|
Updated the macos build to drop support for qtwidgets and PyQt6. Just waiting on the builds to pass to check it. @Huibean are you able to test this build? |
tridge
approved these changes
Mar 30, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Resolves Issue #107
This is probably best considered a draft, but if anyones willing to test, that'd be great.
The testing I've done seems to be fine - things just work.
This PR is currently dependent on the following compatibility changes that have been individually itemised to reduce the complexity of this migration:
QCheckBoxesto make use of binary states rather than the Tristate calls. PyQt6 uses Enums rather than values.This updates
dronecan_gui_toolto use PyQt6 instead of PyQt5 (which is end of life).Largely, PyQt5 changed to PyQt6.
QDirModel was obsoleted and moved to QFileSystemModel.
Some Classes were shifted into different Qt Packages.
Haven't test built on windows - this PR should generate the
*.msifor me, hopefully.