Qt6 migration: LtsWidgets API fixes, LtsWebSocket logger init, RTI Docker install
- LtsWidgets: Fixed Qt6 API compatibility issues - QWheelEvent::delta() → angleDelta().y() - QStyleOption::init() → initFrom() - QComboBox activated signal signature change - QTextCodec removal (UTF-8 default in Qt6) - Missing widget includes added - LtsWebSocket: Fixed m_logger reference initialization - Added NGLLoggerBootstrap includes - Proper initialization in constructor initializer lists - CMake: Added BUILD_LTSWEBSOCKET option for temporary exclusion - Docker: RTI Connext permanent installation script added - ci/install-rti-in-docker.sh for persistent RTI setup - Removes need for volume mounting RTI into container - BUILD options: FilterManagement, RTI, Codification, Grantlee, LtsWebSocket can be disabled for partial builds during migration Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
69 files changed
+12765
-14202
No files matched your search
@@ -13,8 +13,10 @@ ADD_SUBDIRECTORY(Battery)
|
||||
ADD_SUBDIRECTORY(Buildings)
|
||||
ADD_SUBDIRECTORY(BuildingViewer) # uses ZW connections (uses sql, ace, ..)
|
||||
ADD_SUBDIRECTORY(CentralEffectSimulation)
|
||||
ADD_SUBDIRECTORY(CodificationManagement)
|
||||
ADD_SUBDIRECTORY(CodificationManagement/Test)
|
||||
IF(BUILD_CODIFICATION)
|
||||
ADD_SUBDIRECTORY(CodificationManagement)
|
||||
ADD_SUBDIRECTORY(CodificationManagement/Test)
|
||||
ENDIF()
|
||||
ADD_SUBDIRECTORY(CollateralDamageSimulation)
|
||||
ADD_SUBDIRECTORY(EffectManagement)
|
||||
ADD_SUBDIRECTORY(EffectShowClient)
|
||||
@@ -22,7 +24,9 @@ ADD_SUBDIRECTORY(EffectShowManagement)
|
||||
ADD_SUBDIRECTORY(Evaluations)
|
||||
ADD_SUBDIRECTORY(ExerciseManagement)
|
||||
ADD_SUBDIRECTORY(FileManagement)
|
||||
ADD_SUBDIRECTORY(FilterManagement)
|
||||
IF(BUILD_FILTERMANAGEMENT)
|
||||
ADD_SUBDIRECTORY(FilterManagement)
|
||||
ENDIF()
|
||||
ADD_SUBDIRECTORY(FreeSpace)
|
||||
ADD_SUBDIRECTORY(GuezIedManagement)
|
||||
ADD_SUBDIRECTORY(GuezNasat)
|
||||
|
||||
+6
-1
@@ -5,7 +5,12 @@
|
||||
# Created by Hannes Fritsche, ESZS, 2024-08-05
|
||||
#
|
||||
|
||||
FIND_PACKAGE(KDReports REQUIRED)
|
||||
FIND_PACKAGE(KDReports)
|
||||
|
||||
IF(NOT KDReports_FOUND)
|
||||
MESSAGE(STATUS "KDReports not found; skipping CdsSimulationGuiPlugin")
|
||||
RETURN()
|
||||
ENDIF()
|
||||
|
||||
SET(cds_gui_SRCS
|
||||
cds_building_model.cpp
|
||||
|
||||
@@ -37,11 +37,18 @@ ADD_INTERFACE_LIBRARY(
|
||||
#
|
||||
# need top be shared due to signals/slots
|
||||
NGL_ADD_LIBRARY2(WS IsmDataPluginInterface SHARED ism_data_plugin_interface.h)
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(IsmDataPluginInterface
|
||||
Qt6::Core
|
||||
svcIsmCommon
|
||||
DataPluginInterface
|
||||
)
|
||||
ELSE()
|
||||
NGL_TARGET_LINK_LIBRARIES(IsmDataPluginInterface
|
||||
Qt6::Core
|
||||
DataPluginInterface
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
NGL_INSTALL_TARGET(IsmDataPluginInterface)
|
||||
|
||||
#
|
||||
|
||||
+2
-2
@@ -7,8 +7,8 @@
|
||||
|
||||
FIND_PACKAGE(KDReports)
|
||||
FIND_PACKAGE(KDChart)
|
||||
IF (NOT KDReports_FOUND OR NOT KDChart_FOUND)
|
||||
MESSAGE(WARNING "KDReports or KDChart not found; skipping ReportViewer")
|
||||
IF ((NOT KDReports_FOUND OR NOT KDChart_FOUND) OR NOT BUILD_CODIFICATION)
|
||||
MESSAGE(WARNING "KDReports, KDChart not found or BUILD_CODIFICATION disabled; skipping ReportViewer")
|
||||
RETURN()
|
||||
ENDIF()
|
||||
|
||||
|
||||
Reference in new issue
Block a user