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(svcSomCommon
RTI::nddscpp2
PUBLIC
Qt6::Core
ddscore
$<IF:$<TARGET_EXISTS:ddscore>,ddscore,>
ngldb
NGLLogger
)
@@ -68,7 +68,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcSomClient
NGL_TARGET_LINK_LIBRARIES(svcSomClient
PRIVATE
RTI::nddscpp2
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
PUBLIC
svcSomCommon
ddsftc
@@ -95,7 +95,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcSomServer
NGL_TARGET_LINK_LIBRARIES(svcSomServer
PRIVATE
RTI::nddscpp2
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
ddsfts
ngldb
PUBLIC
@@ -131,13 +131,13 @@ NGL_ADD_EXECUTABLE(AAR SV svcSoundManagement ${SRCS_exe})
NGL_TARGET_LINK_LIBRARIES(svcSoundManagement
Qt6::Core
Qt6::Network
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
ddsQoS
svcSomCommon
svcSomServer
svcSomClient
svcIsmClient
ddsconnector
$<IF:$<TARGET_EXISTS:svcIsmClient>,svcIsmClient,>
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
nglsettings
ProjectConfig
LtsCommandLineParser
@@ -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>
@@ -12,8 +12,8 @@
#include <QJsonObject>
#include <QJsonDocument>
#include <QJsonValue>
#include <QSet>
#include <QTimer>
#include <QtCore/QSet>
#include <QtCore/QTimer>
#include <QNetworkReply>
#include <LtsUtilsCore/json_object.h>
@@ -8,7 +8,7 @@
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include "dds_handler.h"
#include "logger.h"
#include <som_db.h>
@@ -21,7 +21,7 @@
// HTTP Request
#include <QNetworkAccessManager>
#include <QTimer>
#include <QtCore/QTimer>
#include <QEventLoop>
@@ -14,7 +14,7 @@
#include "som_db.h"
#include "settings.h"
#include <QFileInfo>
#include <QtCore/QFileInfo>
namespace SoundManagement
{
@@ -6,7 +6,7 @@
*/
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include "dds_handler.h"
#include "handler_sounds.h"
@@ -6,7 +6,7 @@
*/
#pragma once
#include <QString>
#include <QtCore/QString>
namespace NGL
{