CGAL: Qt5 -> Qt6

.github/install.sh

@@ -2,7 +2,8 @@
 sudo apt-get update
 sudo apt-get install -y  libmpfr-dev \
  libeigen3-dev qtbase5-dev libqt5sql5-sqlite libqt5opengl5-dev qtscript5-dev \
- libqt5svg5-dev qttools5-dev qttools5-dev-tools libboost-dev libinsighttoolkit4-dev zsh
+ libqt5svg5-dev qttools5-dev qttools5-dev-tools libboost-dev libinsighttoolkit4-dev zsh \
+ qt6-base-dev qt6-declarative-dev
 #update cmake to 3.18.4
 sudo apt purge --auto-remove cmake
 cd /tmp

AABB_tree/demo/AABB_tree/CMakeLists.txt

@@ -20,59 +20,59 @@ endif()
 # Include this package's headers first
 include_directories(BEFORE ./ ./include)
 
-# Find CGAL and CGAL Qt5
-find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Qt5)
+# Find CGAL and CGAL Qt6
+find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Qt6)
 
-# Find Qt5 itself
-find_package(Qt5 QUIET COMPONENTS Widgets OpenGL)
+# Find Qt6 itself
+find_package(Qt6 QUIET COMPONENTS OpenGLWidgets Widgets OpenGL Qml)
 
-if(CGAL_Qt5_FOUND AND Qt5_FOUND)
+if(CGAL_Qt6_FOUND AND Qt6_FOUND)
 
-  qt5_wrap_ui(UI_FILES MainWindow.ui)
+  qt6_wrap_ui(UI_FILES MainWindow.ui)
 
   include(AddFileDependencies)
 
-  qt5_generate_moc("MainWindow.h" "${CMAKE_CURRENT_BINARY_DIR}/MainWindow_moc.cpp")
+  qt6_generate_moc("MainWindow.h" "${CMAKE_CURRENT_BINARY_DIR}/MainWindow_moc.cpp")
   add_file_dependencies(MainWindow_moc.cpp "${CMAKE_CURRENT_SOURCE_DIR}/MainWindow.h")
 
-  qt5_generate_moc("Viewer.h" "${CMAKE_CURRENT_BINARY_DIR}/Viewer_moc.cpp")
+  qt6_generate_moc("Viewer.h" "${CMAKE_CURRENT_BINARY_DIR}/Viewer_moc.cpp")
   add_file_dependencies(Viewer_moc.cpp "${CMAKE_CURRENT_SOURCE_DIR}/Viewer.h")
 
-  qt5_generate_moc("Scene.h" "${CMAKE_CURRENT_BINARY_DIR}/Scene_moc.cpp")
+  qt6_generate_moc("Scene.h" "${CMAKE_CURRENT_BINARY_DIR}/Scene_moc.cpp")
   add_file_dependencies(Scene_moc.cpp "${CMAKE_CURRENT_SOURCE_DIR}/Scene.h")
 
-  qt5_add_resources(CGAL_Qt5_RESOURCE_FILES AABB_demo.qrc)
+  qt6_add_resources(CGAL_Qt6_RESOURCE_FILES AABB_demo.qrc)
 
   add_file_dependencies(
     AABB_demo.cpp "${CMAKE_CURRENT_BINARY_DIR}/MainWindow_moc.cpp"
     "${CMAKE_CURRENT_BINARY_DIR}/Viewer_moc.cpp"
     "${CMAKE_CURRENT_BINARY_DIR}/Scene_moc.cpp")
 
   add_executable(
-    AABB_demo AABB_demo.cpp ${UI_FILES} ${CGAL_Qt5_RESOURCE_FILES}
-    #${CGAL_Qt5_MOC_FILES}
+    AABB_demo AABB_demo.cpp ${UI_FILES} ${CGAL_Qt6_RESOURCE_FILES}
+    #${CGAL_Qt6_MOC_FILES}
   )
   # Link with Qt libraries
-  target_link_libraries(AABB_demo PRIVATE Qt5::Widgets Qt5::OpenGL
-                                          CGAL::CGAL CGAL::CGAL_Qt5)
+  target_link_libraries(AABB_demo PRIVATE Qt6::OpenGLWidgets Qt6::Widgets Qt6::OpenGL Qt6::Qml
+                                          CGAL::CGAL CGAL::CGAL_Qt6)
 
   add_to_cached_list(CGAL_EXECUTABLE_TARGETS AABB_demo)
 
   include(${CGAL_MODULES_DIR}/CGAL_add_test.cmake)
   cgal_add_compilation_test(AABB_demo)
 
-else(CGAL_Qt5_FOUND AND Qt5_FOUND)
+else(CGAL_Qt6_FOUND AND Qt6_FOUND)
 
   set(AABB_MISSING_DEPS "")
 
-  if(NOT CGAL_Qt5_FOUND)
-    set(AABB_MISSING_DEPS "CGAL_Qt5, ${AABB_MISSING_DEPS}")
+  if(NOT CGAL_Qt6_FOUND)
+    set(AABB_MISSING_DEPS "CGAL_Qt6, ${AABB_MISSING_DEPS}")
   endif()
 
-  if(NOT Qt5_FOUND)
-    set(AABB_MISSING_DEPS "Qt5, ${AABB_MISSING_DEPS}")
+  if(NOT Qt6_FOUND)
+    set(AABB_MISSING_DEPS "Qt6, ${AABB_MISSING_DEPS}")
   endif()
 
   message("NOTICE: This demo requires ${AABB_MISSING_DEPS}, and will not be compiled.")
 
-endif(CGAL_Qt5_FOUND AND Qt5_FOUND)
+endif(CGAL_Qt6_FOUND AND Qt6_FOUND)

AABB_tree/demo/AABB_tree/MainWindow.cpp

@@ -13,8 +13,10 @@
 
 #include "ui_MainWindow.h"
 
+
+
 MainWindow::MainWindow(QWidget* parent)
-: CGAL::Qt::DemosMainWindow(parent)
+  : CGAL::Qt::DemosMainWindow(parent), myEngine(new QJSEngine(this))
 {
   ui = new Ui::MainWindow;
   ui->setupUi(this);
@@ -38,12 +40,25 @@ MainWindow::MainWindow(QWidget* parent)
   connect(this, SIGNAL(openRecentFile(QString)),
     this, SLOT(open(QString)));
 
+  QJSValue mainWindow = myEngine->newQObject(this);
+  myEngine->globalObject().setProperty("main_window", mainWindow);
   readSettings();
+  std::ifstream script("init.js");
+  if(script.good()){
+    std::string line;
+    while(getline(script, line)){
+      myEngine->evaluate(line.c_str());
+    }
+  }
 }
 
 MainWindow::~MainWindow()
 {
   m_pViewer->makeCurrent();
+  // AF I thought this helps to avoid  the exception when the program
+  // terminates, but it does not
+  myEngine->globalObject().setProperty("main_window", QJSValue());
+  myEngine->collectGarbage();
   delete ui;
 }
 
@@ -65,6 +80,13 @@ void MainWindow::dropEvent(QDropEvent *event)
   event->acceptProposedAction();
 }
 
+
+void MainWindow::hello() const
+{
+  std::cout << "Hhello world" << std::endl;
+}
+
+
 void MainWindow::updateViewerBBox()
 {
   m_pScene->update_bbox();
@@ -418,7 +440,3 @@ void MainWindow::on_actionCopy_snapshot_triggered()
   qb->setImage(snapshot);
   QApplication::restoreOverrideCursor();
 }
-
-
-
-

AABB_tree/demo/AABB_tree/MainWindow.h

@@ -1,7 +1,8 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <QtOpenGL/qgl.h>
+#include <QOpenGLWidget>
+#include <QJSEngine>
 #include <CGAL/Qt/DemosMainWindow.h>
 
 class QDragEnterEvent;
@@ -12,6 +13,37 @@ namespace Ui {
   class MainWindow;
 }
 
+#if 0
+
+struct Foo : public QObject
+{
+
+  Q_OBJECT
+public:
+  QJSEngine* myEngine;
+
+  Foo()
+    : myEngine(new QJSEngine(this))
+  {
+      QJSValue baz = myEngine->newQObject(this);
+      myEngine->.globalObject().setProperty("baz", baz);
+  }
+
+  void bar()
+  {
+      std::cout << "bar()" << std::endl;
+      myEngine->evaluate("baz.hello()");
+  }
+
+public slots:
+  void hello() const // if not a slot it must be
+  {
+    std::cout << "called hello()" << std::endl;
+  }
+
+};
+#endif
+
 
 class MainWindow :
   public CGAL::Qt::DemosMainWindow
@@ -22,6 +54,8 @@ class MainWindow :
   ~MainWindow();
 
   public slots:
+
+    void hello() const;
     void updateViewerBBox();
     void open(QString filename);
     void setAddKeyFrameKeyboardModifiers(Qt::KeyboardModifiers);
@@ -79,6 +113,7 @@ class MainWindow :
       void on_actionView_cutting_plane_triggered();
 
 private:
+  QJSEngine* myEngine;
   Scene* m_pScene;
   Viewer* m_pViewer;
   Ui::MainWindow* ui;

AABB_tree/demo/AABB_tree/Scene.h

@@ -1,7 +1,7 @@
 #ifndef SCENE_H
 #define SCENE_H
 
-#include <QtOpenGL/qgl.h>
+#include <QOpenGLWidget>
 #include <iostream>
 #include <cmath>
 
@@ -77,7 +77,7 @@ class Scene : public QObject
     };
 
 public:
-    QGLContext* context;
+    QOpenGLContext* context;
     void draw(CGAL::QGLViewer*);
     void update_bbox();
     Bbox bbox() { return m_bbox; }

AABB_tree/demo/AABB_tree/Viewer.cpp

@@ -1,7 +1,7 @@
 #include "Viewer.h"
 #include "Scene.h"
 #include <QMouseEvent>
-#include <QGLFunctions>
+#include <QOpenGLFunctions>
 #include <CGAL/Qt/CreateOpenGLContext.h>
 
 Viewer::Viewer(QWidget* parent)

AABB_tree/demo/AABB_tree/init.js

@@ -0,0 +1,2 @@
+main_window.hello();
+main_window.hello();

Alpha_shapes_3/demo/Alpha_shapes_3/CMakeLists.txt

@@ -17,36 +17,36 @@ if(POLICY CMP0071)
   cmake_policy(SET CMP0071 NEW)
 endif()
 
-find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Qt5)
+find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Qt6)
 
-find_package(Qt5 QUIET COMPONENTS Widgets OpenGL)
+find_package(Qt6 QUIET COMPONENTS Widgets OpenGL OpenGLWidgets)
 
-if(CGAL_Qt5_FOUND AND Qt5_FOUND)
+if(CGAL_Qt6_FOUND AND Qt6_FOUND)
 
   add_definitions(-DQT_NO_KEYWORDS)
 
   # include(${QT_USE_FILE})
   include_directories(BEFORE ./)
 
   # ui file, created with Qt Designer
-  qt5_wrap_ui(uis MainWindow.ui)
+  qt6_wrap_ui(uis MainWindow.ui)
 
   # qrc files (resources files, that contain icons, at least)
-  qt5_add_resources(CGAL_Qt5_RESOURCE_FILES ./Alpha_shape_3.qrc)
+  qt6_add_resources(CGAL_Qt6_RESOURCE_FILES ./Alpha_shape_3.qrc)
 
   add_executable(
     Alpha_shape_3 Alpha_shape_3.cpp MainWindow.cpp Viewer.cpp ${uis}
-                  ${CGAL_Qt5_RESOURCE_FILES} ${CGAL_Qt5_MOC_FILES})
+                  ${CGAL_Qt6_RESOURCE_FILES} ${CGAL_Qt6_MOC_FILES})
   add_to_cached_list(CGAL_EXECUTABLE_TARGETS Alpha_shape_3)
 
-  target_link_libraries(Alpha_shape_3 PRIVATE CGAL::CGAL CGAL::CGAL_Qt5
-                                              Qt5::Widgets Qt5::OpenGL)
+  target_link_libraries(Alpha_shape_3 PRIVATE CGAL::CGAL CGAL::CGAL_Qt6
+  Qt6::Widgets Qt6::OpenGL Qt6::OpenGLWidgets)
 
   include(${CGAL_MODULES_DIR}/CGAL_add_test.cmake)
   cgal_add_compilation_test(Alpha_shape_3)
 
 else()
 
-  message("NOTICE: This demo requires CGAL and Qt5, and will not be compiled.")
+  message("NOTICE: This demo requires CGAL and Qt6, and will not be compiled.")
 
 endif()

Arrangement_on_surface_2/demo/Arrangement_on_surface_2/CMakeLists.txt

@@ -12,10 +12,10 @@ if(POLICY CMP0071)
   cmake_policy(SET CMP0071 NEW)
 endif()
 
-find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Core Qt5)
-find_package(Qt5 QUIET COMPONENTS Widgets)
+find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Core Qt6)
+find_package(Qt6 QUIET COMPONENTS Widgets)
 
-if (CGAL_Qt5_FOUND AND Qt5_FOUND)
+if (CGAL_Qt6_FOUND AND Qt6_FOUND)
   include(${CGAL_USE_FILE})
   add_compile_definitions(QT_NO_KEYWORDS)
   include_directories( BEFORE ./ )
@@ -50,15 +50,15 @@ if (CGAL_Qt5_FOUND AND Qt5_FOUND)
   endif()
 
 
-  qt5_wrap_ui(arrangement_2_uis
+  qt6_wrap_ui(arrangement_2_uis
               ArrangementDemoWindow.ui
               NewTabDialog.ui
               OverlayDialog.ui
               ArrangementDemoPropertiesDialog.ui
               AlgebraicCurveInputDialog.ui
               RationalCurveInputDialog.ui)
 
-  qt5_wrap_cpp(CGAL_Qt5_MOC_FILES
+  qt6_wrap_cpp(CGAL_Qt6_MOC_FILES
                ArrangementDemoWindow.h
                ArrangementDemoTab.h
                GraphicsViewCurveInput.h
@@ -70,7 +70,7 @@ if (CGAL_Qt5_FOUND AND Qt5_FOUND)
                ColorItemEditor.h
                PropertyValueDelegate.h)
 
-  qt5_add_resources(CGAL_Qt5_RESOURCE_FILES Arrangement_on_surface_2.qrc)
+  qt6_add_resources(CGAL_Qt6_RESOURCE_FILES Arrangement_on_surface_2.qrc)
 
   add_executable(arrangement_2
                  arrangement_2.cpp
@@ -107,11 +107,11 @@ if (CGAL_Qt5_FOUND AND Qt5_FOUND)
                  ArrangementIO.cpp
                  ${UTILS_COMPILE_FILES}
                  ${arrangement_2_uis}
-                 ${CGAL_Qt5_RESOURCE_FILES}
-                 ${CGAL_Qt5_MOC_FILES})
+                 ${CGAL_Qt6_RESOURCE_FILES}
+                 ${CGAL_Qt6_MOC_FILES})
 
-  target_link_libraries(arrangement_2 PRIVATE Qt5::Widgets)
-  target_link_libraries(arrangement_2 PRIVATE CGAL::CGAL CGAL::CGAL_Qt5)
+  target_link_libraries(arrangement_2 PRIVATE Qt6::Widgets)
+  target_link_libraries(arrangement_2 PRIVATE CGAL::CGAL CGAL::CGAL_Qt6)
   if(CGAL_Core_FOUND)
     target_link_libraries(arrangement_2 PRIVATE CGAL::CGAL_Core)
   endif()
@@ -124,11 +124,11 @@ if (CGAL_Qt5_FOUND AND Qt5_FOUND)
 else()
   set(MISSING_DEPS "")
 
-  if(NOT CGAL_Qt5_FOUND)
-    set(MISSING_DEPS "the CGAL Qt5 library, ${MISSING_DEPS}")
+  if(NOT CGAL_Qt6_FOUND)
+    set(MISSING_DEPS "the CGAL Qt6 library, ${MISSING_DEPS}")
   endif()
-  if(NOT Qt5_FOUND)
-    set(MISSING_DEPS "Qt5, ${MISSING_DEPS}")
+  if(NOT Qt6_FOUND)
+    set(MISSING_DEPS "Qt6, ${MISSING_DEPS}")
   endif()
   message("NOTICE: This demo requires ${MISSING_DEPS} and will not be compiled.")
 endif()

Arrangement_on_surface_2/examples/Arrangement_on_surface_2/CMakeLists.txt

@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.1...3.23)
 project(Arrangement_on_surface_2_Examples)
 
-find_package(CGAL REQUIRED COMPONENTS Core OPTIONAL_COMPONENTS Qt5)
+find_package(CGAL REQUIRED COMPONENTS Core OPTIONAL_COMPONENTS Qt6)
 
 # create a target per cppfile
 file(
@@ -15,7 +15,7 @@ foreach(cppfile ${cppfiles})
   create_single_source_cgal_program("${cppfile}")
 endforeach()
 
-if(CGAL_Qt5_FOUND)
+if(CGAL_Qt6_FOUND)
   target_link_libraries(draw_arr PUBLIC CGAL::CGAL_Basic_viewer)
   target_link_libraries(linear_conics PUBLIC CGAL::CGAL_Basic_viewer)
   target_link_libraries(parabolas PUBLIC CGAL::CGAL_Basic_viewer)