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

CGAL: Qt5 -> Qt6 #7397

Merged
merged 96 commits into from
Nov 24, 2023
Merged

CGAL: Qt5 -> Qt6 #7397

Changes from 1 commit
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
ef46506
Add cmake/modules files
afabri Apr 18, 2023
c6ce5fb
Switch to QT6 for the GraphicsView demos
afabri Apr 19, 2023
47683f2
The Truiangulation_2/examples which use draw() compile and visualize …
afabri Apr 19, 2023
b1040de
Surface_mesh example works as well
afabri Apr 19, 2023
42a9757
Fix to have a weak order
afabri Apr 19, 2023
370e81e
AABB Tree demo works
afabri Apr 19, 2023
5601e03
Change all CMakeLists.txt
afabri Apr 19, 2023
5030d67
Target Polyhedron_3 builds and executes, but with all scripting and R…
afabri Apr 19, 2023
b80fbc8
Fixes for target Mesh_3
afabri Apr 20, 2023
bd78a33
PMP compiles [skip ci]
afabri Apr 20, 2023
ab1d799
various fixes [skip ci]
afabri Apr 20, 2023
c77f144
various fixes [skip ci]
afabri Apr 20, 2023
b15e0a1
Fix 'Save As' [skip ci]
afabri Apr 20, 2023
0574c6b
Change the remaining CMakeLists.txt [skip ci]
afabri Apr 20, 2023
7e160aa
Hello QJSEngine [skip ci]
afabri Apr 21, 2023
b4a259c
Hello QJSEngine [skip ci]
afabri Apr 21, 2023
67441a3
Convert all CMakeLists.txt to Qt6
lrineau Apr 25, 2023
134b464
Allocate the QJSEngine on the heap
afabri Apr 26, 2023
f645170
fix memory leak
lrineau Apr 27, 2023
0576e88
Merge branch 'CGAL-fix-Qt5-CMake-GF' into CGAL-Qt6-GF
lrineau Apr 28, 2023
a10460d
Remove trailing whitespaces
lrineau Apr 28, 2023
db652ac
add Qt6 to the CI tests
lrineau Apr 28, 2023
b2a330b
WIP re-adding scripting
afabri Apr 30, 2023
573de7f
Merge branch 'master'
sloriot Jun 22, 2023
aa0d50b
Fix Arrangement_on_surface_2 examples
afabri Jun 26, 2023
1066af1
Add #include
afabri Jun 26, 2023
a015b1d
Fix Straight_skeleton_extrusion test
afabri Jun 26, 2023
63bf2a8
Fix for deprecated warning
afabri Jun 29, 2023
41e8a11
Fix warnings in Arrangement_on_surface
afabri Jun 29, 2023
a633029
Fix for deprecated warning
afabri Jun 30, 2023
125542e
Merge remote-tracking branch 'cgal/master'
sloriot Jul 11, 2023
98fa0c0
Fix for crash on Quit
afabri Jul 18, 2023
c6fd1d0
Merge branch 'master' into CGAL-Qt6-GF
MaelRL Jul 18, 2023
c3b7214
Fix the fix. The floats were already in the range [0,256]
afabri Jul 26, 2023
a025556
Update changes.md
afabri Aug 21, 2023
48bd7cc
fix deprecation warnings from Qt6
lrineau Aug 24, 2023
68bc244
Merge remote-tracking branch 'cgal/master' into HEAD
sloriot Aug 24, 2023
740b570
Merge remote-tracking branch 'refs/remotes/afabri/CGAL-Qt6-GF' into C…
lrineau Aug 24, 2023
79a563b
fix more deprecation warnings
lrineau Aug 24, 2023
da0b65d
fix QSJ/C++ exceptions handling
lrineau Aug 24, 2023
a12a0fa
TBB is a SYSTEM library
lrineau Aug 24, 2023
9f68b1a
TBB is a SYSTEM library, and CGAL::CGAL is not
lrineau Aug 24, 2023
d8583c9
replace deprecated QMatrix4x4*QVector3D by map
lrineau Aug 24, 2023
dc7f6af
check that we have an exact match (whole string)
lrineau Aug 24, 2023
f9c2137
last deprecation warning in a full build of demo/Polyhedron
lrineau Aug 24, 2023
abb9080
cleanup demo/AABB_tree
lrineau Aug 24, 2023
3869a4a
cleanup Alpha_sphare_3 demo
lrineau Aug 24, 2023
df06d29
fix/cleanup AABB_tree and Alpha_shape_3 demos
lrineau Aug 25, 2023
4fbcb93
a few cleanups
lrineau Aug 28, 2023
3a52549
more cleanup of CMake scripts for Qt6
lrineau Aug 29, 2023
7af862e
fix trailing space
lrineau Aug 29, 2023
1f13a62
restore the OpenGL format in DemosMainWindow
lrineau Aug 30, 2023
4740f81
add a target to compile all CGALlab
lrineau Aug 31, 2023
0303b8d
Update CMakeLists for QT6
SaillantNicolas Sep 5, 2023
b286df4
fix warnings (and ASAN errors)
lrineau Sep 8, 2023
a413670
More CMakeLists Updates for QT6
SaillantNicolas Sep 11, 2023
fed2af5
Merge remote-tracking branch 'SaillantNicolas/pr/afabri/7397' into CG…
lrineau Sep 11, 2023
0d7280e
CMakeLists updates for Qt6
SaillantNicolas Sep 11, 2023
1997bd0
Merge remote-tracking branch 'refs/remotes/afabri/CGAL-Qt6-GF' into p…
SaillantNicolas Sep 11, 2023
303282a
fix "Save as..." in CGAL Lab
lrineau Sep 11, 2023
c276b54
Remove one occurence of "qt5"
lrineau Sep 11, 2023
873c3b2
remove a few occurrences of "qt5"
lrineau Sep 11, 2023
cf1b5fd
Update CMakeLists for QT6
SaillantNicolas Sep 13, 2023
4b3279e
Remove the "Use OpenGL" option from 2D demos
lrineau Sep 13, 2023
0d9037b
add the ui file
lrineau Sep 13, 2023
67baec2
Fix Optimal_transportation_reconstruction_2_Demo
lrineau Sep 13, 2023
b01da56
remove occurrences of OpenGLWidgets in demos' CMake scripts
lrineau Sep 13, 2023
03e89cc
fix periodic_3_triangulation_3_demo
lrineau Sep 13, 2023
09a4ac1
cosmetic changes
lrineau Sep 14, 2023
e93a099
finish review of polyhedron demo
lrineau Sep 14, 2023
2f6d51b
Remove a few occurrences of CGAL_Qt5
lrineau Sep 14, 2023
48f37a1
remove occurrences of Qt5
lrineau Sep 14, 2023
68f7646
remove stray CMake debug messages
lrineau Sep 14, 2023
9bba3bd
fix the list of used Qt6 components
lrineau Sep 14, 2023
b05e1e9
Remove UseCGAL.cmake
lrineau Sep 14, 2023
28632f2
Merge branch 'master' into CGAL-Qt6-GF
lrineau Sep 14, 2023
40a7f32
fix a compilation error
lrineau Sep 15, 2023
fe68498
CGALConfig.cmake remove the early return()
lrineau Sep 19, 2023
0ffb256
fix the workflow demo.yml
lrineau Sep 19, 2023
029d7a8
fix test/Installation tests on Windows
lrineau Sep 20, 2023
a72ccf2
Fix CMake error on Windows
lrineau Sep 28, 2023
dda4bf8
fix regression about MOC compilations
lrineau Nov 1, 2023
51627e3
Merge remote-tracking branch 'cgal/master' into CGAL-Qt6-GF
lrineau Nov 1, 2023
980b04e
fix the Arrangement demo
lrineau Nov 1, 2023
dea756e
fix test/Installation on Windows
lrineau Nov 1, 2023
dc0cd7f
make ~Show_point_dialog() virtual
afabri Nov 15, 2023
652f7b2
Replace Q_FOREACH
afabri Nov 15, 2023
3c07d9a
Add virtual
afabri Nov 15, 2023
9ead7b5
Address unused variable warnings
afabri Nov 16, 2023
1dee4f8
Fix conversion warning in T3 demo
afabri Nov 16, 2023
2a223e6
Fix ipelet demo CMakeLists.txt
afabri Nov 16, 2023
bb6222d
Fix ipelet demo CMakeLists.txt
afabri Nov 16, 2023
cfac63f
Merge remote-tracking branch 'cgal/master' into HEAD
sloriot Nov 16, 2023
1f8d66b
add macro in new resource dir
sloriot Nov 16, 2023
15af760
Q_DECL_OVERRIDE -> override
sloriot Nov 22, 2023
f0f1d6a
fix warning
sloriot Nov 22, 2023
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
2 changes: 1 addition & 1 deletion CGAL_ipelets/demo/CGAL_ipelets/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ if(IPE_FOUND AND IPE_VERSION)
cgal_add_compilation_test(CGAL_${IPELET})
endforeach(IPELET)
if(CGAL_Core_FOUND)
target_link_libraries(CGAL_cone_spanners PRIVATE CGAL::CGAL_Core
target_link_libraries(CGAL_cone_spanners PRIVATE CGAL::CGAL CGAL::CGAL_Core
lrineau marked this conversation as resolved.
Show resolved Hide resolved
CGAL::Eigen3_support)
endif()
#example in doc not installed
Expand Down