Cura 8640 PyQt6 upgrade #804
Merged
Conversation
This file contains 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
part of upgrading Qt to v6.2: CURA-8591
part of CURA-8591
part of CURA-8591
part of CURA-8591
part of CURA-8591
This _may_ have been what stopped Pytjon 3.10 even (will try this out -- if we are using 3.10 after this after all then that was probably it). part of CURA-8591
part of CURA-8591
part of CURA-8591
part of CURA-8591
part of CURA-8591
CURA 8591
…ium into PyQt6_upgrade
Conflicts: UM/PluginRegistry.py -> Master changed a bunch of the init for the new Marketplace, while the singleton logic changed for Qt6. UM/Qt/ListModel.py -> Imports got modified at the same time. UM/Qt/QtApplication.py -> Typing got added twice, but in different ways.
part of CURA-7924
Because we had to rename our Python bindings module from Arcus to pyArcus we also changed our import downstream (Cura and Uranium). But in order to limit the changes on our existing code we decided during the review that we should just import pyArcus as Arcus. Contributes to CURA-7924
Cura 7924 sip cmake build
Contributes to CURA-8640
QOpenGLContext has now versionFunctions since PyQt6 Contributes to CURA-8640
# Conflicts: # UM/Qt/qml/UM/MessageStack.qml
This should also install cura and UM in the site-packages in a uniform OS agnotisc path. I also removed the renaming of cura_app.py to cura on Linux. Because this seemed to confuse pyinstaller. Contribute to CURA-8640
Such as a virtual environment Contributes to CURA-8640
Contributes to CURA-8640
# Conflicts: # UM/Stage.py
The solution is to pull the flag from an enum by value. More info about flags here https://doc.qt.io/qt-6/qquickitem.html#Flag-enum CURA-8640
Update imports to use correct version number. CURA-8640
With the update to Qt6 regular vertex and fragment shaders are no longer supported. Instead these shaders need to be compiled to the universal shader language binary qsb format. Using the `scripts/compile-shaders` shell script shader programs can be compiled and written to the cura-binary-files repo. Files from this commit in the cura-binary-data repo are generated using ``` scripts/compile-shaders resources/shaders ../cura-binary-data/uranium/resources/shaders ``` CURA-8640
CURA-8640
Due to API change CURA-8640
2 tasks
This was
linked to
issues
Apr 12, 2022
This was referenced Apr 12, 2022
Closed
added 3 commits
April 13, 2022 12:40
This was still being used in the MaterialBrandsMenu and the SimpleButton Probably why the X es were missing from the info messages. CURA-9110 Contributes to CURA-8640
Contributes to CURA-8640
Contributes to CURA-8640
jellespijker
commented
Apr 13, 2022
Co-authored-by: Jelle Spijker <[email protected]>
Co-authored-by: Jelle Spijker <[email protected]>
Co-authored-by: Jelle Spijker <[email protected]>
Adding spaces, clarifying comments and adding types. Co-authored-by: Jelle Spijker <[email protected]>
…beyond_the_splash
Co-authored-by: Jelle Spijker <[email protected]>
Co-authored-by: Jelle Spijker <[email protected]>
…into qt6_beyond_the_splash
…beyond_the_splash
This reverts commit 708e388.
…beyond_the_splash
This reverts commit 303bbbf.
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.
In order to get this to work on our build-system and working for all three OSes we did a shit tons of boy scouting in our cmake. We removed old methods with variables and try to be consisted in a target-based approach. The idea is that we don't patch stuff down the line, but that the install should place everything in the correct path in a uniform way across all of Cura's dependencies. Most of these changes are in the other PR's. The CMakeLists.txt changes here are for consistency overal.
Main difference is that we don't install in dist-packages anymore.
Part of
Fixes
Todo