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(svcMdmCommon
RTI::nddscpp2
PUBLIC
Qt6::Core
ddscore
$<IF:$<TARGET_EXISTS:ddscore>,ddscore,>
NGLLogger
ngldb
)
@@ -68,7 +68,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcMdmClient
NGL_TARGET_LINK_LIBRARIES(svcMdmClient
PRIVATE
RTI::nddscpp2
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
PUBLIC
svcMdmCommon
ddsftc
@@ -94,7 +94,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcMdmServer
NGL_TARGET_LINK_LIBRARIES(svcMdmServer
PRIVATE
RTI::nddscpp2
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
ddsfts
PUBLIC
svcMdmCommon
@@ -149,11 +149,11 @@ NGL_ADD_EXECUTABLE(AAR SV svcMeteoDataManagement ${SRCS_exe} ${HDRS_exe})
NGL_TARGET_LINK_LIBRARIES(svcMeteoDataManagement
Qt6::Core
Qt6::Network
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
svcMdmCommon
svcMdmServer
svcCoreClient
svcIsmClient
$<IF:$<TARGET_EXISTS:svcIsmClient>,svcIsmClient,>
nglsettings
ProjectConfig
LtsCommandLineParser
@@ -16,8 +16,8 @@
#include <InfrastructureManagement/ism_dtc_types.h>
#include <DDS/DTC/generic_dtc_impl.h>
#include <QObject>
#include <QHash>
#include <QtCore/QObject>
#include <QtCore/QHash>
namespace MeteoDataManagement
{
@@ -8,7 +8,7 @@
#pragma once
#include <QMap>
#include <QtCore/QMap>
#include "handler_meteo_data_unit.h"
#include "logger.h"
@@ -6,7 +6,7 @@
*/
#pragma once
#include <QString>
#include <QtCore/QString>
namespace NGL
{
@@ -10,7 +10,7 @@
#pragma once
#include <QTimer>
#include <QtCore/QTimer>
#include "tcpsocket.h"
@@ -8,7 +8,7 @@
#include "tcpsocket.h"
#include <QTimer>
#include <QtCore/QTimer>
#include <QHostInfo>
//#include <sys/socket.h> // used for keepalive
//#include <netinet/tcp.h> // used for keepalive
@@ -8,7 +8,7 @@
*/
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include "logger.h"
namespace MeteoDataManagement
@@ -11,7 +11,7 @@
#pragma once
#include <QTimer>
#include <QtCore/QTimer>
#include "tcpsocket.h"