-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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.
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
CGAL: Qt5 -> Qt6 #7397
CGAL: Qt5 -> Qt6 #7397
Conversation
The AABB_tree demo works, but there is a runtime error concerning a destructor when exiting the program. |
When editing in the Surface Mesh Selection I get
|
# Conflicts: # AABB_tree/demo/AABB_tree/CMakeLists.txt # Alpha_shapes_3/demo/Alpha_shapes_3/CMakeLists.txt # Arrangement_on_surface_2/demo/Arrangement_on_surface_2/CMakeLists.txt # Circular_kernel_3/demo/Circular_kernel_3/CMakeLists.txt # GraphicsView/demo/Alpha_shapes_2/CMakeLists.txt # GraphicsView/demo/Apollonius_graph_2/CMakeLists.txt # GraphicsView/demo/Bounding_volumes/CMakeLists.txt # GraphicsView/demo/Circular_kernel_2/CMakeLists.txt # GraphicsView/demo/Generator/CMakeLists.txt # GraphicsView/demo/GraphicsView/CMakeLists.txt # GraphicsView/demo/L1_Voronoi_diagram_2/CMakeLists.txt # GraphicsView/demo/Largest_empty_rect_2/CMakeLists.txt # GraphicsView/demo/Periodic_2_triangulation_2/CMakeLists.txt # GraphicsView/demo/Polygon/CMakeLists.txt # GraphicsView/demo/Segment_Delaunay_graph_2/CMakeLists.txt # GraphicsView/demo/Segment_Delaunay_graph_Linf_2/CMakeLists.txt # GraphicsView/demo/Snap_rounding_2/CMakeLists.txt # GraphicsView/demo/Spatial_searching_2/CMakeLists.txt # GraphicsView/demo/Stream_lines_2/CMakeLists.txt # GraphicsView/include/CGAL/Qt/DemosMainWindow_impl.h # Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/CMakeLists.txt # Installation/cmake/modules/CGAL_add_test.cmake # Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt # Optimal_transportation_reconstruction_2/demo/Optimal_transportation_reconstruction_2/CMakeLists.txt # Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt # Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/CMakeLists.txt # Polyhedron/demo/Polyhedron/polyhedron_demo_macros.cmake # Polyline_simplification_2/demo/Polyline_simplification_2/CMakeLists.txt # Principal_component_analysis/demo/Principal_component_analysis/CMakeLists.txt # Triangulation_3/demo/Triangulation_3/CMakeLists.txt # Triangulation_on_sphere_2/demo/Triangulation_on_sphere_2/CMakeLists.txt
In a previous commit I added
I am wondering if we have to add |
For the second "link error" I have no idea. |
@@ -78,7 +78,7 @@ ALIASES = "cgal=%CGAL" \ | |||
"gnu=GNU" \ | |||
"ms=MS" \ | |||
"qt=Qt" \ | |||
"qt5=Qt5" \ | |||
"qt6=Qt6" \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change should also be done in the, on November 15 2023, integrated 1.10.0 version (see warnings in the overnight documentation build https://cgal.geometryfactory.com/CGAL/Manual_doxygen_test/CGAL-6.0-Ic-108/logs_master/Documentation.log
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I note this as a TODO (see the top message).
CGAL-6.0-Ic-113 looks good except some issues that are only present in the testsuite and that are tracked in #7882. We decided to merge the branch so that developer can start testing and report issues. |
Error when compiling Linear cell complex demo: /home/gdamiand/sources/cgal/builds/debug/demo/Linear_cell_complex/ui_MainWindow.h:14:10: fatal error: QtWidgets/QAction: Aucun fichier ou dossier de ce type |
Why not in the testsuite? |
No error when compiling from a fresh install; the error comes probably from some cache effect. Sorry for the noise. |
Summary of Changes
We have to make the transition from Qt5 to Qt6.
This PR starts with the files in
Installation/cmake/modules
, and the demos inGraphicsView/demos
.Locally the Polyhedron demo also works (at least with the 3rd party libraries I have installed on my machine).
There are some commented code sections concerning
QRegExp
as that has changed a lot, and concerning scripting.And there is a beginning of scripting with the
QJSEngine
with this commit.Release Management
Basic_viewer
.TODO
DemoMainWindow.h
.master
and address the comment from Albert: CGAL: Qt5 -> Qt6 #7397 (comment)