Qt6 Migration: Complete migration with DDS/RTI support and build validation
Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
18662 files changed
+4115092
-5435
No files matched your search
@@ -0,0 +1,25 @@
|
||||
#
|
||||
# $Id$
|
||||
# $HeadURL$
|
||||
# $Author$
|
||||
#
|
||||
|
||||
INCLUDE(MacroCodeGenIdl)
|
||||
|
||||
SET(xml_FILE smo_service.xml)
|
||||
|
||||
SET(SRCS_common smo_dummy.cpp)
|
||||
|
||||
# Generate aes_dt[s,c]_types.h, aes_ft[s,c]_types.h
|
||||
CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
|
||||
NGL_ADD_LIBRARY(AAR SV WS svcSmoDummy SHARED ${SRCS_common})
|
||||
NGL_TARGET_LINK_LIBRARIES(svcSmoDummy
|
||||
PRIVATE
|
||||
Qt5::Core
|
||||
)
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(svcSmoDummy
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_BINARY_DIR}/..
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/..
|
||||
)
|
||||
NGL_INSTALL_TARGET(svcSmoDummy)
|
||||
@@ -0,0 +1,3 @@
|
||||
#ifdef WIN32
|
||||
__declspec(dllexport) int foo42(int) { return 42;} // just a dummy to get windows build running
|
||||
#endif
|
||||
@@ -0,0 +1,51 @@
|
||||
/**
|
||||
* Export definitions
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QtCore/qglobal.h>
|
||||
|
||||
#ifndef SMO_COMMON_EXPORT
|
||||
# ifdef BUILD_STATIC_LIBRARIES
|
||||
# define SMO_COMMON_EXPORT
|
||||
# else
|
||||
# if defined(MAKE_SVCSMOCOMMON_LIB)
|
||||
# define SMO_COMMON_EXPORT Q_DECL_EXPORT
|
||||
# ifndef WIN32
|
||||
# ifdef NDDSUSERDllExport
|
||||
# undef NDDSUSERDllExport
|
||||
# endif
|
||||
# define NDDSUSERDllExport Q_DECL_EXPORT
|
||||
# endif
|
||||
# else
|
||||
# define SMO_COMMON_EXPORT Q_DECL_IMPORT
|
||||
# endif
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifndef SMO_CLIENT_EXPORT
|
||||
# ifdef BUILD_STATIC_LIBRARIES
|
||||
# define SMO_CLIENT_EXPORT
|
||||
# else
|
||||
# if defined(MAKE_SVCSMOCLIENT_LIB)
|
||||
# define SMO_CLIENT_EXPORT Q_DECL_EXPORT
|
||||
# else
|
||||
# define SMO_CLIENT_EXPORT Q_DECL_IMPORT
|
||||
# endif
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifndef SMO_SERVER_EXPORT
|
||||
# ifdef BUILD_STATIC_LIBRARIES
|
||||
# define SMO_SERVER_EXPORT
|
||||
# else
|
||||
# if defined(MAKE_SVCSMOSERVER_LIB)
|
||||
# define SMO_SERVER_EXPORT Q_DECL_EXPORT
|
||||
# else
|
||||
# define SMO_SERVER_EXPORT Q_DECL_IMPORT
|
||||
# endif
|
||||
# endif
|
||||
#endif
|
||||
@@ -0,0 +1,32 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
<service namespace="ServiceMonitor" abbreviation="SMO" procNames="ServiceMonitor">
|
||||
<rcs>
|
||||
<Id Id="$Id$"/>
|
||||
<HeadURL HeadURL="$HeadURL$"/>
|
||||
<Author Author="$Author$"/>
|
||||
</rcs>
|
||||
<operatorRights offset="44">
|
||||
<guiPlugin name="ServiceMonitorParticipants" offset="1">
|
||||
<operatorRightGroup name="Service Monitors - Participants" description="Service Monitors for Participants (BITE/Manipulation/CTAS Error Monitor, Equipment Check, Equipment Error Registration, Handgrenade and Mine Search)">
|
||||
<operatorRight right="BiteMonitorShow" value="1" description="Show BITE Monitor"/>
|
||||
<operatorRight right="ManipulationMonitorShow" value="2" description="Show Manipulation Monitor"/>
|
||||
<operatorRight right="EquipmentCheckMonitorShow" value="3" description="Show Equipment Check Monitor"/>
|
||||
<operatorRight right="FaultMonitorShow" value="4" description="Show Fault Monitor"/>
|
||||
<operatorRight right="HandgrenadeMineSearchShow" value="6" description="Show Hand grenade / DUS Mine Search Window"/>
|
||||
<operatorRight right="EgcuMonitorShow" value="7" description="Show EgcuMonitor"/>
|
||||
<operatorRight right="EgcuRoomsEdit" value="8" description="Edit the rooms belonging to one segment."/>
|
||||
</operatorRightGroup>
|
||||
</guiPlugin>
|
||||
<guiPlugin name="ServiceMonitorSystem" offset="2">
|
||||
<operatorRightGroup name="Service Monitors - System" description="Service Monitors for System (SPS and Nagios)">
|
||||
<operatorRight right="SystemMonitorSPS" value="1" description="Show System Monitor"/>
|
||||
<operatorRight right="SystemMonitorNagios" value="2" description="Nagios System Monitor"/>
|
||||
</operatorRightGroup>
|
||||
</guiPlugin>
|
||||
</operatorRights>
|
||||
<enumerations>
|
||||
<enumeration name="dummyEnum">
|
||||
<attribute key="Unknown" value="1"/>
|
||||
</enumeration>
|
||||
</enumerations>
|
||||
</service>
|
||||
Reference in new issue
Block a user