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

@@ -42,9 +42,9 @@ NGL_TARGET_LINK_LIBRARIES(svcAlmCommon
RTI::nddscpp2
PUBLIC
Qt6::Core
ddscore
$<IF:$<TARGET_EXISTS:ddscore>,ddscore,>
NGLLogger
svcPdmCommon
$<IF:$<TARGET_EXISTS:svcPdmCommon>,svcPdmCommon,>
ngldb
)
NGL_INSTALL_TARGET(svcAlmCommon)
@@ -68,7 +68,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcAlmClient
NGL_TARGET_LINK_LIBRARIES(svcAlmClient
PRIVATE
RTI::nddscpp2
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
PUBLIC
svcAlmCommon
ddsftc
@@ -113,9 +113,9 @@ NGL_TARGET_LINK_LIBRARIES(svcAlmServer
RTI::nddscpp2
Qt6::Core
ddsfts
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
ddsQoS
svcPdmCommon
$<IF:$<TARGET_EXISTS:svcPdmCommon>,svcPdmCommon,>
svcAlmCommon
svcAlmClient
svcEemClient
@@ -127,7 +127,7 @@ NGL_TARGET_LINK_LIBRARIES(svcAlmServer
svcTabServer
nglsettings
NGLLogger
ddscore
$<IF:$<TARGET_EXISTS:ddscore>,ddscore,>
ngltools
PUBLIC
svcAlmCommon
@@ -36,7 +36,7 @@ IF(BUILD_TESTING)
svcEemServer
svcPpmServer
LtsCommandLineParser
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
nglcoreapplication
)
IF(NOT BUILD_RPM)
@@ -9,8 +9,8 @@
#include <nglapplication/nglcoreapplication.h>
#include <LtsCommandLineParser/LtsCommandLineParser.h>
#include <QTimer>
#include <QDateTime>
#include <QtCore/QTimer>
#include <QtCore/QDateTime>
#include <QJsonObject>
#include <QJsonDocument>
@@ -10,8 +10,8 @@
#include "initialization.h"
#include <QJsonObject>
#include <QJsonDocument>
#include <QSet>
#include <QTimer>
#include <QtCore/QSet>
#include <QtCore/QTimer>
#include <ProjectDataManagement/pdm_translation.h>
#include <LtsUtilsCore/json_object.h>
@@ -8,7 +8,7 @@
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include "dds_handler.h"
#include "logger.h"
#include <alm_db.h>
@@ -8,7 +8,7 @@
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include <AlarmManagement/alm_db.h>
#include "dds_handler.h"
#include "logger.h"
@@ -8,7 +8,7 @@
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include "dds_handler.h"
#include "logger.h"
@@ -1,6 +1,6 @@
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include <dds_handler.h>
#include "logger.h"
@@ -6,7 +6,7 @@
*/
#pragma once
#include <QString>
#include <QtCore/QString>
namespace NGL
{