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(svcTgtCommon
RTI::nddscpp2
PUBLIC
Qt6::Core
ddscore
$<IF:$<TARGET_EXISTS:ddscore>,ddscore,>
NGLLogger
ngldb
)
@@ -68,7 +68,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcTgtClient
NGL_TARGET_LINK_LIBRARIES(svcTgtClient
PRIVATE
RTI::nddscpp2
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
PUBLIC
svcTgtCommon
ddsftc
@@ -95,7 +95,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcTgtServer
NGL_TARGET_LINK_LIBRARIES(svcTgtServer
PRIVATE
RTI::nddscpp2
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
ddsfts
ngldb
PUBLIC
@@ -144,14 +144,14 @@ CODEGEN_SQL(SRCS_exe ${xml_FILE})
NGL_ADD_EXECUTABLE(AAR SV svcTargetManagement ${SRCS_exe})
NGL_TARGET_LINK_LIBRARIES(svcTargetManagement
Qt6::Core
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
ddsQoS
svcTgtCommon
svcTgtServer
svcTabClient
svcPpmClient
situationMapElevationMap
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
nglsettings
ProjectConfig
LtsCommandLineParser
@@ -37,7 +37,7 @@ IF(BUILD_TESTING)
svcPpmServer
svcTabServer
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>
/* ----------------------------------------------------------------------------------
@@ -34,7 +34,7 @@ IF(BUILD_TESTING
NGLLogger
nglapplication
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
svcTgtClient
svcCoreClient
svcEemServer
@@ -12,7 +12,7 @@
#include <QtTest/QTest>
#include <QtTest/QSignalSpy>
#include <QWeakPointer>
#include <QtCore/QWeakPointer>
#include <nglapplication/nglapplication.h>
#include <nglapplication/nglcoreapplication.h>
@@ -20,7 +20,7 @@
#include <LtsCommandLineParser/LtsCommandLineParser.h>
#include <QTimer>
#include <QtCore/QTimer>
#include <QFlags>
#include <iostream>
@@ -18,7 +18,7 @@
#include <DDS/DDSConnector/dds_connector.h>
#include <QCoreApplication>
#include <QtCore/QCoreApplication>
#include <QtTest/QTest>
#include <memory>
@@ -8,7 +8,7 @@
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include <DDS/DDSConnector/dds_connector.h>
#include <DDS/Core/core_dtc.h>
#include <DDS/Core/topic_lock_master.h>
@@ -8,7 +8,7 @@
#pragma once
#include <QObject>
#include <QtCore/QObject>
#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"
@@ -8,7 +8,7 @@
#pragma once
#include <QObject>
#include <QtCore/QObject>
#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"
@@ -13,7 +13,7 @@
#include <ngldb/db_service_handler.h>
#include "settings.h"
#include <QFileInfo>
#include <QtCore/QFileInfo>
namespace TargetManagement
{
@@ -6,7 +6,7 @@
*/
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include "dds_handler.h"
#include "tgt_db.h"
@@ -6,7 +6,7 @@
*/
#pragma once
#include <QString>
#include <QtCore/QString>
namespace NGL
{
@@ -14,7 +14,7 @@
#include "handler_shootback_target.h"
#include "handler_target_area_assignment.h"
#include <QMap>
#include <QtCore/QMap>
namespace NGL
{