Qt6 migration fixes: RTI DDS alias targets, ErrorMessage namespace, DDS header include path

This commit is contained in:
torsten committed 2026-08-27 09:02:26 +02:00
1 parent 8050bca545
commit bb1447c858
18635 files changed
+2466913 -906310

No files matched your search

@@ -45,7 +45,7 @@ NGL_TARGET_LINK_LIBRARIES(svcSrpCommon
PUBLIC
Qt6::Core
ngldb
ddscore
$<IF:$<TARGET_EXISTS:ddscore>,ddscore,>
NGLLogger
)
NGL_INSTALL_TARGET(svcSrpCommon)
@@ -69,7 +69,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcSrpClient
NGL_TARGET_LINK_LIBRARIES(svcSrpClient
PRIVATE
RTI::nddscpp2
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
PUBLIC
svcSrpCommon
ddsftc
@@ -95,7 +95,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcSrpServer
NGL_TARGET_LINK_LIBRARIES(svcSrpServer
PRIVATE
RTI::nddscpp2
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
ddsfts
PUBLIC
svcSrpCommon
@@ -139,7 +139,7 @@ NGL_TARGET_LINK_LIBRARIES(svcSituationReplay
svcCoreClient
svcSrpCommon
svcSrpServer
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
nglsettings
ProjectConfig
LtsCommandLineParser
@@ -176,7 +176,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(SituationReplaySqlite
${CMAKE_CURRENT_BINARY_DIR}/..
)
NGL_TARGET_LINK_LIBRARIES(SituationReplaySqlite
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
LtsPluginLoader
LtsScriptTimeline
NGLLogger
@@ -191,7 +191,7 @@ NGL_TARGET_LINK_LIBRARIES(SituationReplaySqlite
svcAsmServer
svcExmServer
svcFlmServer
svcIsmServer
$<IF:$<TARGET_EXISTS:svcIsmServer>,svcIsmServer,>
svcPdmServer
svcPpmServer
)
@@ -29,7 +29,7 @@ IF(BUILD_TESTING)
RTI::nddscpp2
svcSrpClient
LtsCommandLineParser
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
nglcoreapplication
)
@@ -41,7 +41,7 @@ IF(BUILD_TESTING)
RTI::nddscpp2
svcSrpClient
LtsCommandLineParser
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
nglcoreapplication
)
IF(NOT BUILD_RPM)
@@ -12,7 +12,7 @@
#include <nglapplication/nglcoreapplication.h>
#include <LtsCommandLineParser/LtsCommandLineParser.h>
#include <QTimer>
#include <QtCore/QTimer>
#include <SituationReplay/srp_dtc.h>
@@ -12,7 +12,7 @@
#include <nglapplication/nglcoreapplication.h>
#include <LtsCommandLineParser/LtsCommandLineParser.h>
#include <QTimer>
#include <QtCore/QTimer>
#include <SituationReplay/srp_ftc.h>
@@ -10,7 +10,7 @@
#include <DDS/DTS/generic_dts_impl.h>
#include <DDS/QosProfile/DDS_DefaultQos.h>
#include <QVector>
#include <QtCore/QVector>
namespace SituationReplay
{
@@ -13,7 +13,7 @@
#include <SituationReplay/srp_db.h>
#include <ngldb/nsqlquery.h>
#include <QCoreApplication>
#include <QtCore/QCoreApplication>
#include <NGLLogger/NGLLoggerBootstrap.h>
namespace SituationReplay
@@ -8,7 +8,7 @@
*/
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include <memory>
#include <SituationReplay/srp_fts.h>
@@ -11,7 +11,7 @@
#include <SituationReplay/situationreplaysqlite_export.h>
#include <SituationReplay/srp_enums.hpp>
#include <QObject>
#include <QtCore/QObject>
#include <memory>
#include "logger.h"
@@ -15,11 +15,11 @@
#include <ngldb/db_service_handler.h>
#include <ngldb/nsqlquery.h>
#include <LtsScriptTimeline/track_entry.h>
#include <QFile>
#include <QtCore/QFile>
#include <QJsonDocument>
#include <QJsonObject>
#include <QJsonParseError>
#include <QSet>
#include <QtCore/QSet>
#include <QSqlError>
namespace SituationReplay
@@ -8,7 +8,7 @@
#pragma once
#include <QJsonObject>
#include <QObject>
#include <QtCore/QObject>
#include <QSqlDatabase>
#include <memory>
@@ -11,8 +11,8 @@
#include "db_reader.h"
#include "logger.h"
#include <QDateTime>
#include <QTimer>
#include <QtCore/QDateTime>
#include <QtCore/QTimer>
#include <QElapsedTimer>
namespace SituationReplay
@@ -7,8 +7,8 @@
*/
#pragma once
#include <QObject>
#include <QTimer>
#include <QtCore/QObject>
#include <QtCore/QTimer>
#include "dds_handler.h"
#include "db_reader.h"
#include <DDS/Core/function_reply_object.h>
@@ -7,7 +7,7 @@
*/
#pragma once
#include <QString>
#include <QtCore/QString>
namespace NGL
{
@@ -9,7 +9,7 @@
#include "static_publisher.h"
#include <QCryptographicHash>
#include <QJsonDocument>
#include <QTimer>
#include <QtCore/QTimer>
#include <DDS/DTS/generic_dts_impl.h>
@@ -17,8 +17,8 @@
#include <AssetManagement/convert_db_to_dds.h>
#include <ExerciseManagement/exm_db.h>
#include <ExerciseManagement/convert_db_to_dds.h>
#include <FileManagement/flm_db.h>
#include <FileManagement/convert_db_to_dds.h>
#include <Lts/Services/FileManagement/flm_db.h>
#include <Lts/Services/FileManagement/convert_db_to_dds.h>
#include <InfrastructureManagement/ism_db.h>
#include <InfrastructureManagement/convert_db_to_dds.h>
#include <ParticipantManagement/ppm_db.h>
@@ -9,7 +9,7 @@
#include "dds_handler.h"
#include <QSqlDatabase>
#include <QObject>
#include <QtCore/QObject>
#include <AssetManagement/asm_dts_types.h>
#include <ExerciseManagement/exm_dts_types.h>
#include <FileManagement/flm_dts_types.h>