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(svcOpmCommon
RTI::nddscpp2
PUBLIC
Qt6::Core
ddscore
$<IF:$<TARGET_EXISTS:ddscore>,ddscore,>
ngldb
LtsUtilsCore
NGLLogger
@@ -71,7 +71,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcOpmClient
NGL_TARGET_LINK_LIBRARIES(svcOpmClient
PRIVATE
RTI::nddscpp2
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
PUBLIC
svcOpmCommon
ddsftc
@@ -97,7 +97,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcOpmServer
NGL_TARGET_LINK_LIBRARIES(svcOpmServer
PRIVATE
RTI::nddscpp2
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
ddsfts
PUBLIC
svcOpmCommon
@@ -166,7 +166,7 @@ NGL_TARGET_LINK_LIBRARIES(svcOperatorManagement
svcOpmCommon
svcOpmClient
svcOpmServer
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
nglsettings
ProjectConfig
LtsCommandLineParser
@@ -22,7 +22,7 @@ IF(BUILD_TESTING)
RTI::nddscpp2
svcOpmClient
LtsCommandLineParser
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
nglcoreapplication
)
IF(NOT BUILD_RPM)
@@ -14,10 +14,10 @@
#include <OperatorManagement/opm_dtc.h>
#include <AreaEffectSimulation/aes_operator_rights.h>
#include <QTimer>
#include <QtCore/QTimer>
#include <QTest>
#include <QCryptographicHash>
#include <QVector>
#include <QtCore/QVector>
using namespace OperatorManagement;
@@ -11,7 +11,7 @@
#include <LtsWebSocket/reply_message.h>
#include <QJsonArray>
#include <QString>
#include <QtCore/QString>
namespace OperatorManagement
{
@@ -8,7 +8,7 @@
*/
#pragma once
#include <QString>
#include <QtCore/QString>
#include <OcBaseDownload/WebSocketInterface/json_keys.h>
@@ -7,7 +7,7 @@
*/
#pragma once
#include <QMap>
#include <QtCore/QMap>
#include "main_handler.h"
#include "logger.h"
@@ -9,7 +9,7 @@
#pragma once
#include <QHash>
#include <QtCore/QHash>
#include <OperatorManagement/opm_dts.h>
#include <OperatorManagement/opm_fts.h>
#include "logger.h"
@@ -7,7 +7,7 @@
*/
#pragma once
#include <QMap>
#include <QtCore/QMap>
#include "main_handler.h"
#include "logger.h"
@@ -7,7 +7,7 @@
*/
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include "logger.h"
#include "opm_db.h"
@@ -13,8 +13,8 @@
#include "handler_group.h"
#include "opm_db.h"
#include <QCryptographicHash>
#include <QSet>
#include <QTimer>
#include <QtCore/QSet>
#include <QtCore/QTimer>
#include <LtsUtilsCore/dds_vector.h>
namespace OperatorManagement
@@ -7,9 +7,9 @@
*/
#pragma once
#include <QHash>
#include <QObject>
#include <QQueue>
#include <QtCore/QHash>
#include <QtCore/QObject>
#include <QtCore/QQueue>
#include "main_handler.h"
#include "logger.h"
@@ -7,7 +7,7 @@
#pragma once
#include <DDS/Core/function_reply_object.h>
#include <QSet>
#include <QtCore/QSet>
// Generated
#include <OperatorManagement/opm_db.h>
@@ -12,7 +12,7 @@
#include <QJsonDocument>
#include <QJsonObject>
#include <QVariantList>
#include <QVector>
#include <QtCore/QVector>
#include <DDS/DTC/generic_dtc.h>
#include <DDS/Generic/generic_data_reader.h>
@@ -9,8 +9,8 @@
#pragma once
#include <OperatorManagement/opm_dtc_impl.h>
#include <QHash>
#include <QVector>
#include <QtCore/QHash>
#include <QtCore/QVector>
//-------------------------------------------------------------------------------------------------------------
namespace OperatorManagement
@@ -6,8 +6,8 @@
*/
#pragma once
#include <QString>
#include <QPair>
#include <QtCore/QString>
#include <QtCore/QPair>
namespace NGL
{