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(svcAsmCommon
PUBLIC
Qt6::Core
ngldb
ddscore
$<IF:$<TARGET_EXISTS:ddscore>,ddscore,>
NGLLogger
)
NGL_INSTALL_TARGET(svcAsmCommon)
@@ -70,7 +70,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcAsmClient
NGL_TARGET_LINK_LIBRARIES(svcAsmClient
PRIVATE
RTI::nddscpp2
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
PUBLIC
svcAsmCommon
ddsftc
@@ -97,7 +97,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcAsmServer
NGL_TARGET_LINK_LIBRARIES(svcAsmServer
PRIVATE
RTI::nddscpp2
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
ddsfts
PUBLIC
svcAsmCommon
@@ -163,7 +163,7 @@ NGL_TARGET_LINK_LIBRARIES(svcAssetManagement
svcAsmCommon
svcAsmServer
svcCoreClient
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
nglsettings
ProjectConfig
LtsCommandLineParser
@@ -22,7 +22,7 @@ IF(BUILD_TESTING)
RTI::nddscpp2
svcAsmClient
LtsCommandLineParser
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
nglcoreapplication
)
IF(NOT BUILD_RPM)
@@ -9,7 +9,7 @@
#include <nglapplication/nglcoreapplication.h>
#include <LtsCommandLineParser/LtsCommandLineParser.h>
#include <QTimer>
#include <QtCore/QTimer>
#include <QTest>
#include <AssetManagement/asm_ftc.h>
@@ -12,7 +12,7 @@
#include <AssetManagement/logger.h>
#include <DDS/DDSConnector/dds_connector.h>
#include <QObject>
#include <QtCore/QObject>
namespace AssetManagement
{
@@ -11,7 +11,7 @@
#include <LtsWebSocket/reply_message.h>
#include <QJsonArray>
#include <QString>
#include <QtCore/QString>
namespace AssetManagement
{
@@ -8,7 +8,7 @@
*/
#pragma once
#include <QString>
#include <QtCore/QString>
#include <OcBaseDownload/WebSocketInterface/json_keys.h>
@@ -7,8 +7,8 @@
*/
#pragma once
#include <QObject>
#include <QHash>
#include <QtCore/QObject>
#include <QtCore/QHash>
#include "dds_handler.h"
#include "logger.h"
@@ -7,8 +7,8 @@
*/
#pragma once
#include <QObject>
#include <QHash>
#include <QtCore/QObject>
#include <QtCore/QHash>
#include "dds_handler.h"
#include "logger.h"
@@ -7,9 +7,9 @@
*/
#pragma once
#include <QObject>
#include <QMap>
#include <QVector>
#include <QtCore/QObject>
#include <QtCore/QMap>
#include <QtCore/QVector>
#include "asm_db_structs.h"
#include "object_map_description.h"
@@ -11,7 +11,7 @@
#include "main_handler.h"
#include "dds_handler.h"
#include <QTimer>
#include <QtCore/QTimer>
namespace AssetManagement
{
@@ -9,8 +9,8 @@
#pragma once
#include <QObject>
#include <QMap>
#include <QtCore/QObject>
#include <QtCore/QMap>
#include "dds_handler.h"
#include "logger.h"
@@ -6,7 +6,7 @@
*/
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include <memory>
#include "dds_handler.h"
@@ -7,7 +7,7 @@
*/
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include "dds_handler.h"
#include "logger.h"
#include <DDS/Core/function_reply_object.h>
@@ -6,8 +6,8 @@
*/
#pragma once
#include <QString>
#include <QPair>
#include <QtCore/QString>
#include <QtCore/QPair>
namespace NGL
{