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

@@ -56,7 +56,7 @@ NGL_TARGET_LINK_LIBRARIES(svcOscCommon
RTI::nddscpp2
PUBLIC
Qt6::Core
ddscore
$<IF:$<TARGET_EXISTS:ddscore>,ddscore,>
NGLLogger
ngldb
)
@@ -81,7 +81,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcOscClient
NGL_TARGET_LINK_LIBRARIES(svcOscClient
PRIVATE
RTI::nddscpp2
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
PUBLIC
svcOscCommon
ddsftc
@@ -107,7 +107,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcOscServer
NGL_TARGET_LINK_LIBRARIES(svcOscServer
PRIVATE
RTI::nddscpp2
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
ddsfts
PUBLIC
svcOscCommon
@@ -166,7 +166,7 @@ NGL_TARGET_LINK_LIBRARIES(svcOcSituationClient
svcTabServer
svcTabocClient
svcTabocServer
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
nglsettings
ProjectConfig
LtsCommandLineParser
@@ -9,7 +9,7 @@
#pragma once
#include <QtCore/QJsonObject>
#include <QVector>
#include <QtCore/QVector>
#include <DDS/Core/core.hpp>
@@ -12,8 +12,8 @@
#include <DDS/Core/core.hpp>
#include <QString>
#include <QMap>
#include <QtCore/QString>
#include <QtCore/QMap>
#include <QtCore/QVector>
#include <QtCore/QJsonObject>
@@ -13,8 +13,8 @@
#include <QJsonDocument>
#include <QJsonObject>
#include <QMap>
#include <QVector>
#include <QtCore/QMap>
#include <QtCore/QVector>
namespace OcSituationClient
{
@@ -9,7 +9,7 @@
#pragma once
#include <QtCore/QObject>
#include <QString>
#include <QtCore/QString>
#include <LtsWebSocket/lts_web_socket_client.h>
@@ -7,7 +7,7 @@
*/
#pragma once
#include <QByteArray>
#include <QtCore/QByteArray>
#include "AreaEffectSimulation/aes_dtc.h"
#include "OcSituationServer/oc_situation.h"
#include "logger.h"
@@ -7,8 +7,8 @@
*/
#pragma once
#include <QObject>
#include <QPointF>
#include <QtCore/QObject>
#include <QtCore/QPointF>
#include <LtsCoordTrans/lts_coord_trans.h>
@@ -8,9 +8,9 @@
#include "handler_oc_central_aes_data.h"
#include <QLineF>
#include <QPointF>
#include <QTimer>
#include <QtCore/QLineF>
#include <QtCore/QPointF>
#include <QtCore/QTimer>
#include <Common/LtsCoordTrans/lts_coord_trans.h>
#include <LtsUtilsCore/qbytearray_byteaccess.h>
@@ -7,9 +7,9 @@
*/
#pragma once
#include <QObject>
#include <QHash>
#include <QSet>
#include <QtCore/QObject>
#include <QtCore/QHash>
#include <QtCore/QSet>
#include <OcSituationServer/oc_situation.h>
#include <AreaEffectSimulation/aes_ftc.h>
@@ -7,8 +7,8 @@
*/
#pragma once
#include <QMap>
#include <QTimer>
#include <QtCore/QMap>
#include <QtCore/QTimer>
#include <OcSituationServer/oc_situation.h>
@@ -7,7 +7,7 @@
*/
#pragma once
#include <QHash>
#include <QtCore/QHash>
#include <ParticipantManagement/ppm_dtc.h>
#include <ParticipantManagement/ppm_ftc.h>
@@ -7,7 +7,7 @@
*/
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include <memory>
#include <AreaEffectSimulation/aes_dtc.h>
@@ -6,7 +6,7 @@
*/
#pragma once
#include <QString>
#include <QtCore/QString>
namespace NGL
{