Skip to content
This repository has been archived by the owner on Dec 9, 2022. It is now read-only.

Cura 8640 PyQt6 upgrade #280

Merged
merged 91 commits into from
Apr 14, 2022
Merged

Cura 8640 PyQt6 upgrade #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
b983508
Add Qt6.2 are a required package to be found
evtrados Jan 25, 2022
d80dc6e
Add all Qt6 related files
evtrados Jan 25, 2022
7dba5fd
Try auto-detecting PyQt6
Ghostkeeper Feb 16, 2022
bcfcdda
Merge remote-tracking branch 'origin/master' into CURA-7924_update_to…
rburema Feb 17, 2022
ecba361
Remove /lib/qml as well
Ghostkeeper Feb 17, 2022
b8b507d
Try without Sip
Ghostkeeper Feb 17, 2022
d68d6f6
Re-add new Qt6 DLLs
Ghostkeeper Feb 17, 2022
601c90c
Don't include Qt folder, but do include QtLocation
Ghostkeeper Feb 17, 2022
a2e7830
Don't include Qt folder, but do include QtLocation
Ghostkeeper Feb 17, 2022
3b75765
CuraEngine found the wrong 'version' of protobuf.
rburema Feb 18, 2022
e322df2
CMake didn't like it with quotes.
rburema Feb 18, 2022
df17049
End-bracket not on newline.
rburema Feb 18, 2022
582ed27
Somehow it was(is?) missing a slash after 'C:'
rburema Feb 18, 2022
756aada
Should be able to find them like this as well right.
rburema Feb 18, 2022
ff5af24
does this work at least?
rburema Feb 18, 2022
1b09123
Replace backslashes for normalized path.
rburema Feb 18, 2022
2148573
Should not be needed in this way anymore.
rburema Feb 18, 2022
e04a13c
Also copy the right dynamic libraries.
rburema Feb 18, 2022
e03f0d8
Manually add Arcus and pynest2d correct ones
Ghostkeeper Feb 21, 2022
eea7e4c
Copy Arcus and Pynest2d to correct subfolder
Ghostkeeper Feb 21, 2022
61d2264
Specify new name of file in AppImage
Ghostkeeper Feb 21, 2022
7566f0a
Try also copying libprotobuf
Ghostkeeper Feb 21, 2022
c3b1f38
Copy Savitar arch-specific build to AppImage too
Ghostkeeper Feb 22, 2022
da565dc
Merge remote-tracking branch 'origin/CURA-8640-Qt6.2' into qt6_sip6
rburema Feb 22, 2022
fb072d1
These seem to be the only ones generated.
rburema Feb 22, 2022
86336f1
Use these after all.
rburema Feb 23, 2022
3c340a6
Changes w.r.t. different approach to upgrade to Sip 6.
rburema Feb 25, 2022
2506277
Fails on this. Should already copy the files though.
rburema Feb 25, 2022
b1b2d6d
Load Sip-packages with new names
Ghostkeeper Feb 25, 2022
1f33e0c
Translate Sip-built package installation to MacOS/Windows
Ghostkeeper Feb 28, 2022
d9995dc
Update Qt library paths to look in Python site-packages
Ghostkeeper Feb 28, 2022
86df5a4
Remove QtCharts and QtDataVisualisation
Ghostkeeper Feb 28, 2022
4ca0f6e
Remove Sip from runtime libraries
Ghostkeeper Feb 28, 2022
f1455c4
Remove duplicate Arcus, Savitar, Nest2d
Ghostkeeper Feb 28, 2022
51c5563
Add the platform plug-ins to the installer
Ghostkeeper Feb 28, 2022
3bf709b
Try removing the hook for PyQt6
Ghostkeeper Feb 28, 2022
c08281d
Link CuraEngine RPath to point to libArcus before packaging
Ghostkeeper Feb 28, 2022
48255f0
Don't include XmlListModel
Ghostkeeper Mar 1, 2022
dfb3a33
Add complete path to XmlListModel to exclude
Ghostkeeper Mar 1, 2022
cde64ae
Try adding the Qt6 libraries manually
Ghostkeeper Mar 1, 2022
6878c3f
Remove attempt at including all Qt6 libs
Ghostkeeper Mar 1, 2022
8ebb3ce
Add RPath for pynest2d's dependencies
Ghostkeeper Mar 1, 2022
5be9f13
pynest2d is in the build environment
Ghostkeeper Mar 1, 2022
aa7a1bb
Modifying the rpath for pynest2d in build-env repo
jellespijker Mar 1, 2022
08d15f0
Try adding Qt6 sub-library
Ghostkeeper Mar 1, 2022
b6997c6
Revert "Try adding Qt6 sub-library"
Ghostkeeper Mar 1, 2022
ac57efc
Don't set specific rpaths pass DYLD_LIBRARY_PATH
jellespijker Mar 1, 2022
c67f601
Use RPATH instead of DYLD_LIBRARY_PATH
jellespijker Mar 1, 2022
7c3badc
Add rpath to CuraEngine
jellespijker Mar 7, 2022
f772030
Use relative rpath
jellespijker Mar 7, 2022
4be9ea4
Use hardcoded rpath as well
jellespijker Mar 7, 2022
3045ef1
Ship python as a debugging tool
jellespijker Mar 8, 2022
3a76719
Use pyinstaller
jellespijker Mar 9, 2022
abc0b74
Don't use cx-freeze on Mac
jellespijker Mar 9, 2022
0bae176
Use uniform method to find python
jellespijker Mar 11, 2022
639b694
Made sure that signing on windows requires MSI var
jellespijker Mar 11, 2022
517d880
EXTERNALPROJECT_INSTALL_PREFIX can be set from arg
jellespijker Mar 11, 2022
31d74ff
Variables can now be set in uniform method
jellespijker Mar 11, 2022
044868d
Prepend "-" in front of extra version information
jellespijker Mar 11, 2022
d3f29ef
Moving Cura related variables in the Cura project
jellespijker Mar 11, 2022
42be9ef
Removed olway of setting BUILD_OFFLINE
jellespijker Mar 11, 2022
8fbe8c4
Fixed CURA_DEBUGMODE variable
jellespijker Mar 11, 2022
48071c4
Use CMAKE_INSTALL_PREFIX
jellespijker Mar 11, 2022
f4e4098
Created a Python build module helper
jellespijker Mar 11, 2022
5308945
use the Python build module helper for finding PythonPackages
jellespijker Mar 11, 2022
616c880
Moved Uranium logic to Uranium project
jellespijker Mar 11, 2022
90b1743
Removed BuildPlatformDetection
jellespijker Mar 11, 2022
8cef1f5
Make sure that MACOSX_DEPLOYMENT_TARGET is set before the project call
jellespijker Mar 11, 2022
efba2a7
Moved CuraEngine logic to CuraEngine Project
jellespijker Mar 11, 2022
81f3b94
Moved Charon logic to Charon Project
jellespijker Mar 11, 2022
0a349e1
Moved cura-binary-data logic to cura-binary-data Project
jellespijker Mar 11, 2022
4252a0c
Don't use glob
jellespijker Mar 11, 2022
c558573
Moved fdm_materials logic fdm_materials project
jellespijker Mar 11, 2022
11a4f8c
Fixed typo in generator expression
jellespijker Mar 11, 2022
9ad4200
use the -E flag for the cmake command
jellespijker Mar 11, 2022
ba08cb2
Added quotation marks
jellespijker Mar 11, 2022
f2d5824
Alternative way of setting the environment
jellespijker Mar 11, 2022
f1ff078
Use CMAKE_COMMAND
jellespijker Mar 11, 2022
afeed6c
Don't set env
jellespijker Mar 11, 2022
c7ac20d
MacOS seems to link against lib-mingw
jellespijker Mar 11, 2022
2fbd933
Don't check against DEFINED
jellespijker Mar 11, 2022
922f01f
Set mingw args old style
jellespijker Mar 11, 2022
dd3dc4e
No need to set environment
jellespijker Mar 11, 2022
b7cb929
Setting rpath for CuraEngine should be done in CuraEngine
jellespijker Mar 14, 2022
3517099
Rundeck should sign and package
jellespijker Mar 14, 2022
6121ce2
Don't use update
jellespijker Mar 15, 2022
4e27d44
Use local specified sitelib
jellespijker Mar 24, 2022
243450d
Also use Python local sitelib for Charon
jellespijker Mar 24, 2022
8fbc06e
Don't encapsulate with quotes
jellespijker Mar 24, 2022
8d43eac
Make sure Python is found before configuring depended on projects
jellespijker Mar 25, 2022
72651dd
We no longer use cura-build people should be made aware
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
1 change: 0 additions & 1 deletion .dockerignore
View file
Open in desktop

This file was deleted.

37 changes: 0 additions & 37 deletions .gitignore
View file
Open in desktop

This file was deleted.

140 changes: 0 additions & 140 deletions CMakeLists.txt
View file
Open in desktop

This file was deleted.

69 changes: 0 additions & 69 deletions NSIS/CharStrStrip.nsh
View file
Open in desktop

This file was deleted.

Loading