Migration of Legatus codebase to Qt6 with RTI Connext DDS 7.7 integration is partially complete. Core DDS targets build successfully, but ProjectDataManagement module blocks full ddsfts compilation due to IDL definition conflicts.

qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/CMakeLists.txt

@@ -88,17 +88,17 @@ endif()
 
 # SV: logView
 NGL_ADD_LIBRARY2(WS AAR SV nglwidgets SHARED ${nglwidgets_SRCS} ${oxygen_SRCS})
-NGL_TARGET_INCLUDE_DIRECTORIES(nglwidgets
-  PRIVATE
-    ${POPPLER_QT6_INCLUDE_DIR}
-)
+if(HAVE_POPPLER_QT6)
+  target_compile_definitions(nglwidgets PRIVATE HAVE_POPPLER_QT6)
+  target_include_directories(nglwidgets PRIVATE ${POPPLER_QT6_INCLUDE_DIRS})
+  target_link_libraries(nglwidgets PRIVATE ${POPPLER_QT6_LIBRARIES})
+endif()
 if(QT6_GUI_AVAILABLE)
   NGL_TARGET_LINK_LIBRARIES(nglwidgets
     PRIVATE
       NGLLogger
       ngltranslator
       ngltools
-      ${POPPLER_QT6_LIBRARY}
     PUBLIC
       Qt6::Core
       ${Qt6_Widgets}

qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglpdfpage.h

@@ -36,6 +36,7 @@ public:
 Q_SIGNALS:
   void linkClicked(const Poppler::LinkDestination &dest);
 #endif
+public:
   void setZoomFactor(double zoom);
   void clearPixmap();
   QSize sizeHint() const override;