Prepare building with Qt6

* Fwk: Switch from delta to angleDelta for QWheelEvent
* Fwk: Add option to build more libraries with Qt6
* Fwk: Remove unused includes of QtOpenGL
* Fwk: Don't forward declare QStringList
* Fwk: Store cursor position in QPoint variable
* Fwk: Use QWheelEvent::position in Qt6

Fwk/AppFwk/CommonCode/CMakeLists.txt

@@ -14,6 +14,15 @@ find_package(OpenGL)
 # These headers need to go through Qt's MOC compiler
 set(MOC_HEADER_FILES cafMessagePanel.h)
 
+if(CEE_USE_QT6)
+  find_package(
+    Qt6
+    COMPONENTS
+    REQUIRED Core Gui Widgets OpenGL
+  )
+  set(QT_LIBRARIES Qt6::Core Qt6::Gui Qt6::Widgets Qt6::OpenGL)
+  qt_standard_project_setup()
+else()
   find_package(
     Qt5
     COMPONENTS
@@ -21,6 +30,7 @@ find_package(
   )
   set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL)
   qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
+endif()
 
 add_library(
   ${PROJECT_NAME}

Fwk/AppFwk/CommonCode/cafEffectGenerator.cpp

@@ -58,8 +58,6 @@
 #include "cvfTextureImage.h"
 #include "cvfUniform.h"
 
-#include <QtOpenGL/QGLFormat>
-
 namespace caf
 {
 //#############################################################################################################################

Fwk/AppFwk/CommonCode/cafUtils.cpp

@@ -42,8 +42,6 @@
 #include <QLineEdit>
 #include <QRegularExpression>
 
-#include <QtOpenGL/QGLContext>
-
 #include <QFileDialog>
 #include <QMessageBox>
 

Fwk/AppFwk/CommonCode/cafUtils.h

@@ -38,9 +38,10 @@
 
 #include <vector>
 
+#include <QStringList>
+
 class QLineEdit;
 class QString;
-class QStringList;
 
 namespace caf
 {

Fwk/AppFwk/cafViewer/CMakeLists.txt

@@ -11,6 +11,15 @@ endif()
 # These headers need to go through Qt's MOC compiler
 set(MOC_HEADER_FILES cafViewer.h)
 
+if(CEE_USE_QT6)
+  find_package(
+    Qt6
+    COMPONENTS
+    REQUIRED Core Gui Widgets OpenGL
+  )
+  set(QT_LIBRARIES Qt6::Core Qt6::Gui Qt6::Widgets Qt6::OpenGL)
+  qt_standard_project_setup()
+else()
   find_package(
     Qt5
     COMPONENTS
@@ -18,6 +27,7 @@ find_package(
   )
   set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL)
   qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
+endif()
 
 add_library(
   ${PROJECT_NAME}

Fwk/AppFwk/cafViewer/cafCadNavigation.cpp

@@ -144,16 +144,22 @@ bool caf::CadNavigation::handleInputEvent( QInputEvent* inputEvent )
             {
                 QWheelEvent* we = static_cast<QWheelEvent*>( inputEvent );
 
-                updatePointOfInterestDuringZoomIfNecessary( we->x(), we->y() );
+#if ( QT_VERSION < QT_VERSION_CHECK( 5, 15, 0 ) )
+                QPoint cursorPosition = we->pos();
+#else
+                QPoint cursorPosition = we->position().toPoint();
+#endif
+
+                updatePointOfInterestDuringZoomIfNecessary( cursorPosition.x(), cursorPosition.y() );
 
                 if ( m_isRotCenterInitialized )
                 {
                     int translatedMousePosX, translatedMousePosY;
-                    cvfEventPos( we->x(), we->y(), &translatedMousePosX, &translatedMousePosY );
+                    cvfEventPos( cursorPosition.x(), cursorPosition.y(), &translatedMousePosX, &translatedMousePosY );
 
                     cvf::ref<cvf::Ray> ray = createZoomRay( translatedMousePosX, translatedMousePosY );
 
-                    zoomAlongRay( ray.p(), -we->delta() );
+                    zoomAlongRay( ray.p(), -we->angleDelta().y() );
                 }
                 isEventHandled = true;
             }

Fwk/AppFwk/cafViewer/cafCeetronNavigation.cpp

@@ -200,13 +200,18 @@ void caf::CeetronNavigation::wheelEvent( QWheelEvent* event )
     if ( vpHeight <= 0 ) return;
 
     int navDelta = vpHeight / 5;
-    if ( event->delta() < 0 ) navDelta *= -1;
+    if ( event->angleDelta().y() < 0 ) navDelta *= -1;
 
-    int posY = m_viewer->height() - event->y();
+#if ( QT_VERSION < QT_VERSION_CHECK( 5, 15, 0 ) )
+    QPoint cursorPosition = event->pos();
+#else
+    QPoint cursorPosition = event->position().toPoint();
+#endif
+    int posY = m_viewer->height() - cursorPosition.y();
 
-    m_trackball->startNavigation( ManipulatorTrackball::WALK, event->x(), posY );
+    m_trackball->startNavigation( ManipulatorTrackball::WALK, cursorPosition.x(), posY );
 
-    m_trackball->updateNavigation( event->x(), posY + navDelta );
+    m_trackball->updateNavigation( cursorPosition.x(), posY + navDelta );
     m_trackball->endNavigation();
 
     m_viewer->updateParallelProjectionHeightFromMoveZoom( m_pointOfInterest );

Fwk/AppFwk/cafViewer/cafCeetronPlusNavigation.cpp

@@ -185,16 +185,22 @@ bool caf::CeetronPlusNavigation::handleInputEvent( QInputEvent* inputEvent )
             {
                 QWheelEvent* we = static_cast<QWheelEvent*>( inputEvent );
 
-                updatePointOfInterestDuringZoomIfNecessary( we->x(), we->y() );
+#if ( QT_VERSION < QT_VERSION_CHECK( 5, 15, 0 ) )
+                QPoint cursorPosition = we->pos();
+#else
+                QPoint cursorPosition = we->position().toPoint();
+#endif
+
+                updatePointOfInterestDuringZoomIfNecessary( cursorPosition.x(), cursorPosition.y() );
 
                 if ( m_isRotCenterInitialized )
                 {
                     int translatedMousePosX, translatedMousePosY;
-                    cvfEventPos( we->x(), we->y(), &translatedMousePosX, &translatedMousePosY );
+                    cvfEventPos( cursorPosition.x(), cursorPosition.y(), &translatedMousePosX, &translatedMousePosY );
 
                     cvf::ref<cvf::Ray> ray = createZoomRay( translatedMousePosX, translatedMousePosY );
 
-                    zoomAlongRay( ray.p(), we->delta() );
+                    zoomAlongRay( ray.p(), we->angleDelta().y() );
                 }
                 isEventHandled = true;
             }

Fwk/AppFwk/cafVizExtensions/CMakeLists.txt

@@ -10,6 +10,18 @@ endif()
 find_package(OpenGL)
 
 # Qt
+if(CEE_USE_QT6)
+  find_package(
+    Qt6
+    COMPONENTS
+    REQUIRED Core Gui Widgets OpenGL
+  )
+  set(QT_LIBRARIES Qt6::Core Qt6::Gui Qt6::Widgets Qt6::OpenGL)
+  qt_standard_project_setup()
+  set_property(
+    SOURCE cafTransparentWBRenderConfiguration.cpp PROPERTY SKIP_AUTOMOC ON
+  )
+else()
   find_package(
     Qt5
     COMPONENTS
@@ -17,6 +29,7 @@ find_package(
   )
   set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL)
   qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
+endif()
 
 add_library(
   ${PROJECT_NAME}

Fwk/CMakeLists.txt

@@ -32,9 +32,22 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNO_DEBUG")
 endif()
 
-
+if(CEE_USE_QT6)
-find_package(Qt5 COMPONENTS REQUIRED Core Gui OpenGL Widgets)
+  find_package(
+    Qt6
+    COMPONENTS
+    REQUIRED Core Gui OpenGL Widgets
+  )
+  set(QT_LIBRARIES Qt6::Core Qt6::Gui Qt6::OpenGL Qt6::Widgets)
+  qt_standard_project_setup()
+else()
+  find_package(
+    Qt5
+    COMPONENTS
+    REQUIRED Core Gui OpenGL Widgets
+  )
   set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::OpenGL Qt5::Widgets)
+endif()
 
 # Libraries
 add_subdirectory(AppFwk/cafProjectDataModel/cafPdmCore)