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

@@ -43,7 +43,7 @@ NGL_TARGET_LINK_LIBRARIES(svcScmCommon
RTI::nddscpp2
PUBLIC
Qt6::Core
ddscore
$<IF:$<TARGET_EXISTS:ddscore>,ddscore,>
NGLLogger
ngldb
)
@@ -68,7 +68,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcScmClient
NGL_TARGET_LINK_LIBRARIES(svcScmClient
PRIVATE
RTI::nddscpp2
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
PUBLIC
svcScmCommon
ddsftc
@@ -94,7 +94,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcScmServer
NGL_TARGET_LINK_LIBRARIES(svcScmServer
PRIVATE
RTI::nddscpp2
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
ddsfts
PUBLIC
svcScmCommon
@@ -166,7 +166,7 @@ NGL_ADD_EXECUTABLE(SV AAR svcServiceManagement ${SRCS_exe})
NGL_TARGET_LINK_LIBRARIES(svcServiceManagement
Qt6::Core
svcCoreClient
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
codegen_base
LtsCommandLineParser
nglsinglecoreapplication
@@ -17,8 +17,8 @@
#include <DDS/DTC/generic_dtc_impl.h>
#include <QtTest/QTest>
#include <QVariant>
#include <QThread>
#include <QtCore/QVariant>
#include <QtCore/QThread>
@@ -8,7 +8,7 @@
*/
#pragma once
#include <QObject>
#include <QtCore/QObject>
// For Topic Exercise
#include <ServiceManagement/scm_dtc_types.h>
@@ -8,7 +8,7 @@
*/
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include <QSignalSpy>
#include <ServiceManagement/scm_dts_types.h>
@@ -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 ServiceManagement
{
@@ -8,9 +8,9 @@
#pragma once
#include <QObject>
#include <QSet>
#include <QVector>
#include <QtCore/QObject>
#include <QtCore/QSet>
#include <QtCore/QVector>
#include "logger.h"
#include "dds_handler.h"
@@ -8,7 +8,7 @@
#include "licence_handler.h"
#include "dds_handler.h"
#include <QFile>
#include <QtCore/QFile>
#include <LtsLicence/aes_crypt.h>
@@ -10,9 +10,9 @@
#include "licence_donator.h"
#include "dds_handler.h"
#include "logger.h"
#include <QObject>
#include <QString>
#include <QVector>
#include <QtCore/QObject>
#include <QtCore/QString>
#include <QtCore/QVector>
#include <LtsLicence/lts_licence.h>
@@ -8,7 +8,7 @@
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include <ServiceManagement/scm.hpp>
@@ -8,9 +8,9 @@
#include "service_handler.h"
#include <QCoreApplication>
#include <QDateTime>
#include <QTimer>
#include <QtCore/QCoreApplication>
#include <QtCore/QDateTime>
#include <QtCore/QTimer>
#include "service.h"
#include "service_process.h"
@@ -8,8 +8,8 @@
#pragma once
#include <QSet>
#include <QVector>
#include <QtCore/QSet>
#include <QtCore/QVector>
#include "logger.h"
#include "service_donator.h"
@@ -6,7 +6,7 @@
*/
#pragma once
#include <QString>
#include <QtCore/QString>
namespace NGL
{