lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Qt6 migration fixes: RTI DDS alias targets, ErrorMessage namespace, DDS header include path

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/CMakeLists.txt
+4 -4
View File
@@ -43,7 +43,7 @@ NGL_TARGET_LINK_LIBRARIES(svcExmCommon
RTI::nddscpp2
PUBLIC
Qt6::Core
ddscore
$<IF:$<TARGET_EXISTS:ddscore>,ddscore,>
NGLLogger
ngldb
LtsUtilsCore
@@ -69,7 +69,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcExmClient
NGL_TARGET_LINK_LIBRARIES(svcExmClient
PRIVATE
RTI::nddscpp2
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
PUBLIC
svcExmCommon
ddsftc
@@ -96,7 +96,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcExmServer
NGL_TARGET_LINK_LIBRARIES(svcExmServer
PRIVATE
RTI::nddscpp2
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
ddsfts
LtsUtilsCore
PUBLIC
@@ -160,7 +160,7 @@ NGL_ADD_SVC_ICON(SRCS_exe)
NGL_ADD_EXECUTABLE(AAR SV svcExerciseManagement ${SRCS_exe})
NGL_TARGET_LINK_LIBRARIES(svcExerciseManagement
dbAdminCopyExercise
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
LtsCommandLineParser
LtsWebSocketServer
nglcoreapplication
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/ModuleTests/CMakeLists.txt
+2 -2
View File
@@ -18,7 +18,7 @@ IF(BUILD_TESTING AND TARGET svcExmClient)
svcExmClient
svcAsmClient
LtsCommandLineParser
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
nglcoreapplication
)
IF(NOT BUILD_RPM)
@@ -45,7 +45,7 @@ IF(BUILD_TESTING AND TARGET svcExmClient)
TARGET_COMPILE_DEFINITIONS(exmStateMachineTest PUBLIC EXM_OBJECT_EXERCISE_NO_HANDLER)
TARGET_LINK_LIBRARIES(exmStateMachineTest
dbAdminCopyExercise
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
nglcoreapplication
NGLLogger
ngltools
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/ModuleTests/exm_statemachine_test.cpp
+1 -1
View File
@@ -19,7 +19,7 @@
#include <ExerciseManagement/settings.h>
#include <ExerciseManagement/logger.h>
#include <QCoreApplication>
#include <QtCore/QCoreApplication>
#include <QDebug>
#include <QSignalSpy>
#include <QTest>
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/ModuleTests/exm_statemachine_test.h
+1 -1
View File
@@ -7,7 +7,7 @@
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include <memory>
#include <ExerciseManagement/exm_db.h>
#include <ngldb/db_service_handler.h>
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/ModuleTests/exm_tests.cpp
+1 -1
View File
@@ -11,7 +11,7 @@
#include <nglapplication/nglcoreapplication.h>
#include <LtsCommandLineParser/LtsCommandLineParser.h>
#include <QTimer>
#include <QtCore/QTimer>
#include <QTest>
#include <ExerciseManagement/exm_ftc.h>
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/CMakeLists.txt
+1 -1
View File
@@ -21,7 +21,7 @@ IF(BUILD_TESTING AND TARGET svcExmCommon)
NGLLogger
RTI::nddscpp2
svcExmCommon
ddscore
$<IF:$<TARGET_EXISTS:ddscore>,ddscore,>
ddsgen
ddsdts
ddsdtc
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/data_topic_tests.cpp
+2 -2
View File
@@ -17,8 +17,8 @@
#include <DDS/DTC/generic_dtc_impl.h>
#include <QtTest/QTest>
#include <QVariant>
#include <QThread>
#include <QtCore/QVariant>
#include <QtCore/QThread>
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/data_topic_tests.h
+1 -1
View File
@@ -8,7 +8,7 @@
*/
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include <DDS/Generic/subscriber_listener.h>
// For Topic Exercise
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/data_topic_tests_main.h
+1 -1
View File
@@ -8,7 +8,7 @@
*/
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include <QSignalSpy>
#include <ExerciseManagement/exm_dts_types.h>
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/WebSocketInterface/Messages/reply_message.h
+1 -1
View File
@@ -11,7 +11,7 @@
#include <LtsWebSocket/reply_message.h>
#include <QJsonArray>
#include <QString>
#include <QtCore/QString>
#include <QtCore/QVector>
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/WebSocketInterface/json_keys.h
+1 -1
View File
@@ -8,7 +8,7 @@
*/
#pragma once
#include <QString>
#include <QtCore/QString>
#include <OcBaseDownload/WebSocketInterface/json_keys.h>
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/exercise_state_machine.h
+1 -1
View File
@@ -10,7 +10,7 @@
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include <QStateMachine>
#include <ExerciseManagement/exm_enums.hpp>
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/exercise_state_manager.h
+2 -2
View File
@@ -8,9 +8,9 @@
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include <functional>
#include <QMap>
#include <QtCore/QMap>
#include <ExerciseManagement/exm_enums.hpp>
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise.cpp
+2 -2
View File
@@ -13,8 +13,8 @@
#include "object_exercise.h"
#include "settings.h"
//#include <QPixmap>
#include <QTimer>
//#include <QtGui/QPixmap>
#include <QtCore/QTimer>
#include <vector>
#include <LtsUtilsCore/dds_vector_to_pixmap.h>
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise.h
+4 -4
View File
@@ -8,11 +8,11 @@
*/
#pragma once
#include <QObject>
#include <QQueue>
#include <QHash>
#include <QtCore/QObject>
#include <QtCore/QQueue>
#include <QtCore/QHash>
#include <QCache>
#include <QSize>
#include <QtCore/QSize>
#include <DBAdministration/exercise_table_generator.h>
#include "dds_handler.h"
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise_phase.cpp
+2 -2
View File
@@ -7,8 +7,8 @@
#include "handler_exercise_phase.h"
#include <QDateTime>
#include <QString>
#include <QtCore/QDateTime>
#include <QtCore/QString>
#include "dds_handler.h"
#include "exm_db.h"
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise_phase.h
+1 -1
View File
@@ -8,7 +8,7 @@
*/
#pragma once
#include <QMap>
#include <QtCore/QMap>
#include "logger.h"
#include "exm_fts.h"
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/main_handler.h
+1 -1
View File
@@ -6,7 +6,7 @@
*/
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include <memory>
#include "dds_handler.h"
#include "exm_db.h"
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/object_exercise.cpp
+1 -1
View File
@@ -17,7 +17,7 @@
#include <DBAdministration/copy_exercise.h>
#include <DBAdministration/exercise_table_generator.h>
#include <Common/ProjectConfig/project_defines.h>
#include <QDateTime>
#include <QtCore/QDateTime>
namespace ExerciseManagement
{
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/object_exercise.h
+1 -1
View File
@@ -6,7 +6,7 @@
*/
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include "dds_handler.h"
#include <DDS/Core/function_reply_object.h>
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/settings.h
+2 -2
View File
@@ -6,8 +6,8 @@
*/
#pragma once
#include <QString>
#include <QPair>
#include <QtCore/QString>
#include <QtCore/QPair>
namespace NGL
{