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.

Sign up for GitHub

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

Jump to bottom

Cura 8640 PyQt6 upgrade #17

Merged
merged 12 commits into from
Apr 14, 2022
Merged

Cura 8640 PyQt6 upgrade #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
da2c207
Use shader tools to generate qsb files for the RecolorImage shaders
casperlamboo Mar 30, 2022
d81a001
Update recolor shaders programs
casperlamboo Apr 1, 2022
5a18f20
Install shader files
jellespijker Apr 5, 2022
d4ab3fb
Fixed typo in path
jellespijker Apr 5, 2022
c206a02
Install shader files
jellespijker Apr 7, 2022
afcca3e
Removed the x32 vcredist
jellespijker Apr 7, 2022
f1f5e8a
Replaced the vcredist_x64 with the latest
jellespijker Apr 7, 2022
5287505
Fixed wrong path to VC_redist.x64
jellespijker Apr 7, 2022
76439c5
Merge remote-tracking branch 'origin/qt6_beyond_the_splash' into CURA…
jellespijker Apr 7, 2022
b0025d9
Removed qsb shader files
jellespijker Apr 12, 2022
3b43794
Removed VC Redistribution
jellespijker Apr 12, 2022
ec1b1b7
partially revert removal of windows shipped bins
jellespijker Apr 12, 2022
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
6 changes: 2 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,5 @@ if(ENABLE_WHATSNEW_INSTALL)
endif()

if(WIN32)
install(FILES windows/vcredist_x64.exe DESTINATION ".")
install(FILES windows/vcredist_x32.exe DESTINATION ".")
install(DIRECTORY windows/arduino DESTINATION ".")
endif()
install(DIRECTORY windows/arduino DESTINATION ".")
endif()
Binary file removed windows/vcredist_x32.exe
View file
Open in desktop
Binary file not shown.
Binary file removed windows/vcredist_x64.exe
View file
Open in desktop
Binary file not shown.