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

@@ -44,7 +44,7 @@ NGL_TARGET_LINK_LIBRARIES(svcMrkCommon
PUBLIC
Qt6::Core
ngldb
ddscore
$<IF:$<TARGET_EXISTS:ddscore>,ddscore,>
NGLLogger
)
NGL_INSTALL_TARGET(svcMrkCommon)
@@ -68,7 +68,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcMrkClient
NGL_TARGET_LINK_LIBRARIES(svcMrkClient
PRIVATE
RTI::nddscpp2
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
PUBLIC
svcMrkCommon
ddsftc
@@ -112,7 +112,7 @@ NGL_TARGET_LINK_LIBRARIES(svcMrkServer
PRIVATE
Qt6::Core
RTI::nddscpp2
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
ddsfts
svcCoreClient
nglsettings
@@ -18,7 +18,7 @@ IF(BUILD_TESTING AND TARGET svcMrkClient)
RTI::nddscpp2
svcMrkClient
LtsCommandLineParser
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
nglcoreapplication
)
IF(NOT BUILD_RPM)
@@ -9,10 +9,10 @@
#include <nglapplication/nglcoreapplication.h>
#include <LtsCommandLineParser/LtsCommandLineParser.h>
#include <QTimer>
#include <QDateTime>
#include <QString>
#include <QVector>
#include <QtCore/QTimer>
#include <QtCore/QDateTime>
#include <QtCore/QString>
#include <QtCore/QVector>
#include <MarkerManagement/mrk_ftc.h>
#include <MarkerManagement/mrk_dtc.h>
@@ -8,7 +8,7 @@
#pragma once
#include <QVector>
#include <QtCore/QVector>
#include "dds_handler.h"
#include "mrk_db.h"
#include <DDS/Core/function_reply_object.h>
@@ -7,7 +7,7 @@
*/
#pragma once
#include <QString>
#include <QtCore/QString>
namespace NGL
{