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.

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

merged 96 commits into from
Nov 24, 2023

Commits on Apr 18, 2023

  1. Add cmake/modules files

    afabri committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    ef46506 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2023

  1. Configuration menu
    Copy the full SHA
    c6ce5fb View commit details
    Browse the repository at this point in the history
  2. The Truiangulation_2/examples which use draw() compile and visualize …

    …but have an assertion in a QMap
    afabri committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    47683f2 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b1040de View commit details
    Browse the repository at this point in the history
  4. Fix to have a weak order

    afabri committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    42a9757 View commit details
    Browse the repository at this point in the history
  5. AABB Tree demo works

    afabri committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    370e81e View commit details
    Browse the repository at this point in the history
  6. Change all CMakeLists.txt

    afabri committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    5601e03 View commit details
    Browse the repository at this point in the history
  7. Target Polyhedron_3 builds and executes, but with all scripting and R…

    …egExp (deprecated) commented
    afabri committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    5030d67 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2023

  1. Fixes for target Mesh_3

    afabri committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    b80fbc8 View commit details
    Browse the repository at this point in the history
  2. PMP compiles [skip ci]

    afabri committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    bd78a33 View commit details
    Browse the repository at this point in the history
  3. various fixes [skip ci]

    afabri committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    ab1d799 View commit details
    Browse the repository at this point in the history
  4. various fixes [skip ci]

    afabri committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    c77f144 View commit details
    Browse the repository at this point in the history
  5. Fix 'Save As' [skip ci]

    afabri committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    b15e0a1 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    0574c6b View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2023

  1. Hello QJSEngine [skip ci]

    afabri committed Apr 21, 2023
    Configuration menu
    Copy the full SHA
    7e160aa View commit details
    Browse the repository at this point in the history
  2. Hello QJSEngine [skip ci]

    afabri committed Apr 21, 2023
    Configuration menu
    Copy the full SHA
    b4a259c View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2023

  1. Configuration menu
    Copy the full SHA
    67441a3 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2023

  1. Configuration menu
    Copy the full SHA
    134b464 View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2023

  1. fix memory leak

    lrineau committed Apr 27, 2023
    Configuration menu
    Copy the full SHA
    f645170 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2023

  1. Merge branch 'CGAL-fix-Qt5-CMake-GF' into CGAL-Qt6-GF

    # 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
    lrineau committed Apr 28, 2023
    Configuration menu
    Copy the full SHA
    0576e88 View commit details
    Browse the repository at this point in the history
  2. Remove trailing whitespaces

    lrineau committed Apr 28, 2023
    Configuration menu
    Copy the full SHA
    a10460d View commit details
    Browse the repository at this point in the history
  3. add Qt6 to the CI tests

    lrineau committed Apr 28, 2023
    Configuration menu
    Copy the full SHA
    db652ac View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2023

  1. WIP re-adding scripting

    afabri committed Apr 30, 2023
    Configuration menu
    Copy the full SHA
    b2a330b View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2023

  1. Merge branch 'master'

    sloriot committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    573de7f View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2023

  1. Configuration menu
    Copy the full SHA
    aa0d50b View commit details
    Browse the repository at this point in the history
  2. Add #include

    afabri committed Jun 26, 2023
    Configuration menu
    Copy the full SHA
    1066af1 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a015b1d View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2023

  1. Fix for deprecated warning

    afabri committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    63bf2a8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    41e8a11 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2023

  1. Fix for deprecated warning

    afabri committed Jun 30, 2023
    Configuration menu
    Copy the full SHA
    a633029 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2023

  1. Configuration menu
    Copy the full SHA
    125542e View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2023

  1. Fix for crash on Quit

    afabri committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    98fa0c0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c6fd1d0 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2023

  1. Configuration menu
    Copy the full SHA
    c3b7214 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2023

  1. Update changes.md

    afabri committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    a025556 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2023

  1. Configuration menu
    Copy the full SHA
    48bd7cc View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    68bc244 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    740b570 View commit details
    Browse the repository at this point in the history
  4. fix more deprecation warnings

    lrineau committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    79a563b View commit details
    Browse the repository at this point in the history
  5. fix QSJ/C++ exceptions handling

    The javascript testsuite passes.
    lrineau committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    da0b65d View commit details
    Browse the repository at this point in the history
  6. TBB is a SYSTEM library

    lrineau committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    a12a0fa View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    9f68b1a View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    d8583c9 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    dc7f6af View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    f9c2137 View commit details
    Browse the repository at this point in the history
  11. cleanup demo/AABB_tree

    lrineau committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    abb9080 View commit details
    Browse the repository at this point in the history
  12. cleanup Alpha_sphare_3 demo

    lrineau committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    3869a4a View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2023

  1. Configuration menu
    Copy the full SHA
    df06d29 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2023

  1. a few cleanups

    lrineau committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    4fbcb93 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2023

  1. Configuration menu
    Copy the full SHA
    3a52549 View commit details
    Browse the repository at this point in the history
  2. fix trailing space

    lrineau committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    7af862e View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2023

  1. restore the OpenGL format in DemosMainWindow

    That still does not work well when the widget is a `QOpenGLWidget`.
    We probably need to derive from that class, to call `glClearColor(..)`
    in the `paintGL()` method.
    lrineau committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    1f13a62 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2023

  1. Configuration menu
    Copy the full SHA
    4740f81 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2023

  1. Configuration menu
    Copy the full SHA
    0303b8d View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2023

  1. Configuration menu
    Copy the full SHA
    b286df4 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2023

  1. Configuration menu
    Copy the full SHA
    a413670 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fed2af5 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0d7280e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    1997bd0 View commit details
    Browse the repository at this point in the history
  5. fix "Save as..." in CGAL Lab

    lrineau committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    303282a View commit details
    Browse the repository at this point in the history
  6. Remove one occurence of "qt5"

    lrineau committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    c276b54 View commit details
    Browse the repository at this point in the history
  7. remove a few occurrences of "qt5"

    There are still a lot!
    lrineau committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    873c3b2 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2023

  1. Configuration menu
    Copy the full SHA
    cf1b5fd View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4b3279e View commit details
    Browse the repository at this point in the history
  3. add the ui file

    lrineau committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    0d9037b View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    67baec2 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    b01da56 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    03e89cc View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2023

  1. cosmetic changes

    lrineau committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    09a4ac1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e93a099 View commit details
    Browse the repository at this point in the history
  3. Remove a few occurrences of CGAL_Qt5

    ... and replace by CGAL_Qt6
    lrineau committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    2f6d51b View commit details
    Browse the repository at this point in the history
  4. remove occurrences of Qt5

    lrineau committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    48f37a1 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    68f7646 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    9bba3bd View commit details
    Browse the repository at this point in the history
  7. Remove UseCGAL.cmake

    and our old CMake macros `use_lib` and `use_component`.
    lrineau committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    b05e1e9 View commit details
    Browse the repository at this point in the history
  8. Merge branch 'master' into CGAL-Qt6-GF

    # Conflicts:
    #	Installation/CHANGES.md
    lrineau committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    28632f2 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2023

  1. fix a compilation error

    The generated `ui_Deform_mesh.h` was not is in the right directory.
    I have moved the definition of the item in the plugin directory.
    lrineau committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    40a7f32 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2023

  1. CGALConfig.cmake remove the early return()

    Otherwise we have a lot of warnings like:
    ```
    CMake Warning at /usr/lib64/cmake/Qt6/QtPublicWalkLibsHelpers.cmake:284 (message):
      When trying to collect dependencies of target
      'Constrained_Delaunay_triangulation_2', the non-existent target 'Qt6::Svg'
      was encountered.  This can likely be fixed by moving the find_package call
      that pulls in 'Qt6::Svg' to the scope of directory
      '/home/lrineau/Git/cgal-testsuite-dockerfiles/testsuite/CGAL-6.0-Ic-66/test/Triangulation_2_Demo'
      or higher.  This warning can be silenced by setting
      QT_SILENCE_MISSING_DEPENDENCY_TARGET_WARNING to ON.
    Call Stack (most recent call first):
      /usr/lib64/cmake/Qt6/QtPublicWalkLibsHelpers.cmake:320 (__qt_internal_print_missing_dependency_target_warning)
      /usr/lib64/cmake/Qt6Core/Qt6CoreMacros.cmake:609 (__qt_internal_collect_all_target_dependencies)
      /usr/lib64/cmake/Qt6Core/Qt6CoreMacros.cmake:709 (_qt_internal_finalize_executable)
      /usr/lib64/cmake/Qt6Core/Qt6CoreMacros.cmake:564:EVAL:1 (qt6_finalize_target)
      test/Triangulation_2_Demo/CMakeLists.txt:DEFERRED
    ```
    
    The issue was that `find_package(Qt6) ...` is required in any
    sub-directory, because imported targets like `Qt6::Svg` are
    local to the directory scope.
    lrineau committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    fe68498 View commit details
    Browse the repository at this point in the history
  2. fix the workflow demo.yml

    The four batches were wrong: they all compiled all the plugins, instead
    of only a fourth of them.
    lrineau committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    0ffb256 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2023

  1. Configuration menu
    Copy the full SHA
    029d7a8 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2023

  1. Fix CMake error on Windows

    https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-6.0-Ic-73/Installation/TestReport_Christo_MSVC-2022-Preview-Release.gz
    ```
    CMake Error at cmake/modules/CGAL_SetupGMP.cmake:73 (target_link_libraries):
      The plain signature for target_link_libraries has already been used with
      the target "test_gmp_mpfr_dll".  All uses of target_link_libraries with a
      target must be either all-keyword or all-plain.
    
      The uses of the plain signature are here:
    
       * test/Installation/CMakeLists.txt:54 (target_link_libraries)
    
    Call Stack (most recent call first):
      test/Installation/CMakeLists.txt:55 (use_CGAL_GMP_support)
    ```
    lrineau committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    a72ccf2 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2023

  1. fix regression about MOC compilations

    The commit b05e1e9 was indeed the
    cause of the regression. But the root cause was an incorrect
    usage of `qt6_generate_moc`.
    
    The addition of `TARGET ${plugin_name}` triggered the use of the
    property `INCLUDE_DIRECTORIES` of the target.
    
    See https://doc.qt.io/qt-6/qt-generate-moc.html#arguments
    lrineau committed Nov 1, 2023
    Configuration menu
    Copy the full SHA
    dda4bf8 View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'cgal/master' into CGAL-Qt6-GF

    # Conflicts:
    #	GraphicsView/demo/Bounding_volumes/CMakeLists.txt
    lrineau committed Nov 1, 2023
    Configuration menu
    Copy the full SHA
    51627e3 View commit details
    Browse the repository at this point in the history
  3. fix the Arrangement demo

    lrineau committed Nov 1, 2023
    Configuration menu
    Copy the full SHA
    980b04e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    dea756e View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2023

  1. Configuration menu
    Copy the full SHA
    dc0cd7f View commit details
    Browse the repository at this point in the history
  2. Replace Q_FOREACH

    afabri committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    652f7b2 View commit details
    Browse the repository at this point in the history
  3. Add virtual

    afabri committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    3c07d9a View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2023

  1. Configuration menu
    Copy the full SHA
    9ead7b5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1dee4f8 View commit details
    Browse the repository at this point in the history
  3. Fix ipelet demo CMakeLists.txt

    afabri committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    2a223e6 View commit details
    Browse the repository at this point in the history
  4. Fix ipelet demo CMakeLists.txt

    afabri committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    bb6222d View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    cfac63f View commit details
    Browse the repository at this point in the history
  6. add macro in new resource dir

    sloriot committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    1f8d66b View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2023

  1. Q_DECL_OVERRIDE -> override

    sloriot committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    15af760 View commit details
    Browse the repository at this point in the history
  2. fix warning

    sloriot committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    f0f1d6a View commit details
    Browse the repository at this point in the history