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
+6
@@ -0,0 +1,6 @@
|
||||
# CMake generated Testfile for
|
||||
# Source directory: /workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap
|
||||
# Build directory: /workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/build4/Lts/Plugins/SituationMapPlugin/Gui/SituationMap
|
||||
#
|
||||
# This file includes the relevant testing commands required for
|
||||
# testing this directory and lists subdirectories to be tested as well.
|
||||
+1829
File diff suppressed because it is too large.
Load diff
+93
@@ -0,0 +1,93 @@
|
||||
# Install script for directory: /workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap
|
||||
|
||||
# Set the install prefix
|
||||
if(NOT DEFINED CMAKE_INSTALL_PREFIX)
|
||||
set(CMAKE_INSTALL_PREFIX "/shd/CTC")
|
||||
endif()
|
||||
string(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
|
||||
|
||||
# Set the install configuration name.
|
||||
if(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME)
|
||||
if(BUILD_TYPE)
|
||||
string(REGEX REPLACE "^[^A-Za-z0-9_]+" ""
|
||||
CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}")
|
||||
else()
|
||||
set(CMAKE_INSTALL_CONFIG_NAME "Debug")
|
||||
endif()
|
||||
message(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"")
|
||||
endif()
|
||||
|
||||
# Set the component getting installed.
|
||||
if(NOT CMAKE_INSTALL_COMPONENT)
|
||||
if(COMPONENT)
|
||||
message(STATUS "Install component: \"${COMPONENT}\"")
|
||||
set(CMAKE_INSTALL_COMPONENT "${COMPONENT}")
|
||||
else()
|
||||
set(CMAKE_INSTALL_COMPONENT)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
# Install shared libraries without execute permission?
|
||||
if(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
|
||||
set(CMAKE_INSTALL_SO_NO_EXE "1")
|
||||
endif()
|
||||
|
||||
# Is this installation the result of a crosscompile?
|
||||
if(NOT DEFINED CMAKE_CROSSCOMPILING)
|
||||
set(CMAKE_CROSSCOMPILING "FALSE")
|
||||
endif()
|
||||
|
||||
# Set path to fallback-tool for dependency-resolution.
|
||||
if(NOT DEFINED CMAKE_OBJDUMP)
|
||||
set(CMAKE_OBJDUMP "/usr/bin/objdump")
|
||||
endif()
|
||||
|
||||
if(CMAKE_INSTALL_COMPONENT STREQUAL "Unspecified" OR NOT CMAKE_INSTALL_COMPONENT)
|
||||
if(EXISTS "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/WS/lib/libSitmapDds.so" AND
|
||||
NOT IS_SYMLINK "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/WS/lib/libSitmapDds.so")
|
||||
file(RPATH_CHECK
|
||||
FILE "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/WS/lib/libSitmapDds.so"
|
||||
RPATH "")
|
||||
endif()
|
||||
file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/WS/lib" TYPE SHARED_LIBRARY FILES "/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/build4/lib/libSitmapDds.so")
|
||||
if(EXISTS "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/WS/lib/libSitmapDds.so" AND
|
||||
NOT IS_SYMLINK "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/WS/lib/libSitmapDds.so")
|
||||
file(RPATH_CHANGE
|
||||
FILE "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/WS/lib/libSitmapDds.so"
|
||||
OLD_RPATH "/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/build4/lib:/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/include/GeographicLib/lib:/workspace/external/rti_connext_dds-7.7.0/lib/x64Linux4gcc8.5.0:"
|
||||
NEW_RPATH "")
|
||||
if(CMAKE_INSTALL_DO_STRIP)
|
||||
execute_process(COMMAND "/usr/bin/strip" "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/WS/lib/libSitmapDds.so")
|
||||
endif()
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(CMAKE_INSTALL_COMPONENT STREQUAL "Unspecified" OR NOT CMAKE_INSTALL_COMPONENT)
|
||||
endif()
|
||||
|
||||
if(CMAKE_INSTALL_COMPONENT STREQUAL "Unspecified" OR NOT CMAKE_INSTALL_COMPONENT)
|
||||
if(EXISTS "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/WS/lib/libSitmapGuiPlugin.so" AND
|
||||
NOT IS_SYMLINK "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/WS/lib/libSitmapGuiPlugin.so")
|
||||
file(RPATH_CHECK
|
||||
FILE "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/WS/lib/libSitmapGuiPlugin.so"
|
||||
RPATH "")
|
||||
endif()
|
||||
file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/WS/lib" TYPE MODULE FILES "/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/build4/lib/libSitmapGuiPlugin.so")
|
||||
if(EXISTS "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/WS/lib/libSitmapGuiPlugin.so" AND
|
||||
NOT IS_SYMLINK "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/WS/lib/libSitmapGuiPlugin.so")
|
||||
file(RPATH_CHANGE
|
||||
FILE "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/WS/lib/libSitmapGuiPlugin.so"
|
||||
OLD_RPATH "/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/build4/lib:/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/include/GeographicLib/lib:/workspace/external/rti_connext_dds-7.7.0/lib/x64Linux4gcc8.5.0:"
|
||||
NEW_RPATH "")
|
||||
if(CMAKE_INSTALL_DO_STRIP)
|
||||
execute_process(COMMAND "/usr/bin/strip" "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/WS/lib/libSitmapGuiPlugin.so")
|
||||
endif()
|
||||
endif()
|
||||
endif()
|
||||
|
||||
string(REPLACE ";" "\n" CMAKE_INSTALL_MANIFEST_CONTENT
|
||||
"${CMAKE_INSTALL_MANIFEST_FILES}")
|
||||
if(CMAKE_INSTALL_LOCAL_ONLY)
|
||||
file(WRITE "/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/build4/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/install_local_manifest.txt"
|
||||
"${CMAKE_INSTALL_MANIFEST_CONTENT}")
|
||||
endif()
|
||||
+43
@@ -0,0 +1,43 @@
|
||||
|
||||
#ifndef SITMAPDDS_EXPORT_H
|
||||
#define SITMAPDDS_EXPORT_H
|
||||
|
||||
#ifdef SITMAPDDS_STATIC_DEFINE
|
||||
# define SITMAPDDS_EXPORT
|
||||
# define SITMAPDDS_NO_EXPORT
|
||||
#else
|
||||
# ifndef SITMAPDDS_EXPORT
|
||||
# ifdef SitmapDds_EXPORTS
|
||||
/* We are building this library */
|
||||
# define SITMAPDDS_EXPORT __attribute__((visibility("default")))
|
||||
# else
|
||||
/* We are using this library */
|
||||
# define SITMAPDDS_EXPORT __attribute__((visibility("default")))
|
||||
# endif
|
||||
# endif
|
||||
|
||||
# ifndef SITMAPDDS_NO_EXPORT
|
||||
# define SITMAPDDS_NO_EXPORT __attribute__((visibility("hidden")))
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifndef SITMAPDDS_DEPRECATED
|
||||
# define SITMAPDDS_DEPRECATED __attribute__ ((__deprecated__))
|
||||
#endif
|
||||
|
||||
#ifndef SITMAPDDS_DEPRECATED_EXPORT
|
||||
# define SITMAPDDS_DEPRECATED_EXPORT SITMAPDDS_EXPORT SITMAPDDS_DEPRECATED
|
||||
#endif
|
||||
|
||||
#ifndef SITMAPDDS_DEPRECATED_NO_EXPORT
|
||||
# define SITMAPDDS_DEPRECATED_NO_EXPORT SITMAPDDS_NO_EXPORT SITMAPDDS_DEPRECATED
|
||||
#endif
|
||||
|
||||
/* NOLINTNEXTLINE(readability-avoid-unconditional-preprocessor-if) */
|
||||
#if 0 /* DEFINE_NO_DEPRECATED */
|
||||
# ifndef SITMAPDDS_NO_DEPRECATED
|
||||
# define SITMAPDDS_NO_DEPRECATED
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#endif /* SITMAPDDS_EXPORT_H */
|
||||
+43
@@ -0,0 +1,43 @@
|
||||
|
||||
#ifndef SITMAPGUIPLUGIN_EXPORT_H
|
||||
#define SITMAPGUIPLUGIN_EXPORT_H
|
||||
|
||||
#ifdef SITMAPGUIPLUGIN_STATIC_DEFINE
|
||||
# define SITMAPGUIPLUGIN_EXPORT
|
||||
# define SITMAPGUIPLUGIN_NO_EXPORT
|
||||
#else
|
||||
# ifndef SITMAPGUIPLUGIN_EXPORT
|
||||
# ifdef SitmapGuiPlugin_EXPORTS
|
||||
/* We are building this library */
|
||||
# define SITMAPGUIPLUGIN_EXPORT __attribute__((visibility("default")))
|
||||
# else
|
||||
/* We are using this library */
|
||||
# define SITMAPGUIPLUGIN_EXPORT __attribute__((visibility("default")))
|
||||
# endif
|
||||
# endif
|
||||
|
||||
# ifndef SITMAPGUIPLUGIN_NO_EXPORT
|
||||
# define SITMAPGUIPLUGIN_NO_EXPORT __attribute__((visibility("hidden")))
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifndef SITMAPGUIPLUGIN_DEPRECATED
|
||||
# define SITMAPGUIPLUGIN_DEPRECATED __attribute__ ((__deprecated__))
|
||||
#endif
|
||||
|
||||
#ifndef SITMAPGUIPLUGIN_DEPRECATED_EXPORT
|
||||
# define SITMAPGUIPLUGIN_DEPRECATED_EXPORT SITMAPGUIPLUGIN_EXPORT SITMAPGUIPLUGIN_DEPRECATED
|
||||
#endif
|
||||
|
||||
#ifndef SITMAPGUIPLUGIN_DEPRECATED_NO_EXPORT
|
||||
# define SITMAPGUIPLUGIN_DEPRECATED_NO_EXPORT SITMAPGUIPLUGIN_NO_EXPORT SITMAPGUIPLUGIN_DEPRECATED
|
||||
#endif
|
||||
|
||||
/* NOLINTNEXTLINE(readability-avoid-unconditional-preprocessor-if) */
|
||||
#if 0 /* DEFINE_NO_DEPRECATED */
|
||||
# ifndef SITMAPGUIPLUGIN_NO_DEPRECATED
|
||||
# define SITMAPGUIPLUGIN_NO_DEPRECATED
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#endif /* SITMAPGUIPLUGIN_EXPORT_H */
|
||||
Reference in new issue
Block a user