Added test case and setting Test configuration

qt6-after/qt6-migrated-legatus/.gitignore

@@ -12,3 +12,4 @@ Lts/Tools/ArAssetsV3/build
 Lts/Tools/ArAssetsV3_Qatar/build
 build/
 build2/
+build4/

qt6-after/qt6-migrated-legatus/Dockerfile.build

@@ -0,0 +1,34 @@
+#   docker build -f Dockerfile.build -t legatus-build:26.04 .
+FROM ubuntu:26.04
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update -qq && apt-get install -y -qq --no-install-recommends \
+      build-essential \
+      cmake \
+      libkf6texttemplate-dev \
+      libqt6core6 \
+      libqt6gui6 \
+      libqt6widgets6 \
+      qt6-base-dev \
+      qt6-tools-dev-tools \
+      qt6-tools-dev \
+      qt6-l10n-tools \
+      libgtest-dev \
+      git \
+      file \
+      binutils \
+      gdb \
+      less \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV QT_QPA_PLATFORM=offscreen
+
+ENV RTI_LICENSE_FILE=/workspace/rti_license.dat \
+    DDS_PATH=/opt/rti_connext_dds-7.7.0 \
+    NDDSHOME=/opt/rti_connext_dds-7.7.0 \
+    CMAKE_PREFIX_PATH=/opt/Qt/6.10.2/gcc_64 \
+    LD_LIBRARY_PATH=/workspace/qt6-after/qt6-migrated-legatus/build4/lib:/opt/rti_connext_dds-7.7.0/lib/x64Linux4gcc8.5.0
+
+WORKDIR /workspace/qt6-after/qt6-migrated-legatus
+CMD ["bash"]

qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/GeneratorGrantleeBase.cpp

@@ -38,11 +38,7 @@ bool GeneratorGrantleeBase::initInternal(const XmlReader* reader, StructBuilder*
         m_ctx->insert(QStringLiteral("namespace"), reader->getServiceNamespace());
         m_ctx->insert(QStringLiteral("namespace_abbr"), reader->getServiceAbbr().toLower());
         m_ctx->insert(QStringLiteral("namespace_abbr_upper"), reader->getServiceAbbr().toUpper());
-        if (reader->getServiceNamespace() == QLatin1String("Core"))
+        m_ctx->insert(QStringLiteral("include_prefix"), reader->getServiceNamespace());
-            m_ctx->insert(QStringLiteral("include_prefix"),
-                          QStringLiteral("DDS/%1").arg(reader->getServiceNamespace()));
-        else
-            m_ctx->insert(QStringLiteral("include_prefix"), reader->getServiceNamespace());
         m_ctx->insert(QStringLiteral("custom_record_replay"), reader->hasCustomRecordReplayPlugin());
     }
     return true;

qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/GrantleeWrappers.cpp

@@ -61,17 +61,15 @@ QString MemberInformationWrapper::ddsToJsonElement() const
     if (cppMemberName().isEmpty())
         return QStringLiteral("obj[QStringLiteral(\"") + cppType() + QStringLiteral("\")] = element;");
 
-    const QString memberAccess = isCppStruct() ? cppMemberName() : cppMemberName() + QStringLiteral("()");
+    // The DDS_PSM_Cxx mapping (see cmake/MacroRTIDDSGen.cmake) gives generated
+    // types accessor methods, so members are always reached via foo().
     if (!isOptional())
         return QStringLiteral("obj[QStringLiteral(\"") + cppMemberName() + QStringLiteral("\")] = ") + cppToJsonPre() +
-               QStringLiteral("element.") + memberAccess + cppToJsonPost();
+               QStringLiteral("element.") + cppMemberName() + QStringLiteral("()") + cppToJsonPost();
 
-    const QString optionalAccess =
+    return QStringLiteral("if (element.") + cppMemberName() + QStringLiteral("().is_set()) ") +
-        isCppStruct() ? cppMemberName() + QStringLiteral(".is_set()") : cppMemberName() + QStringLiteral("().is_set()");
-    const QString getValue = isCppStruct() ? cppMemberName() : cppMemberName() + QStringLiteral("()");
-    return QStringLiteral("if (element.") + optionalAccess + QStringLiteral(") ") +
            QStringLiteral("obj[QStringLiteral(\"") + cppMemberName() + QStringLiteral("\")] = ") + cppToJsonPre() +
-           QStringLiteral("*element.") + getValue + cppToJsonPost();
+           QStringLiteral("element.") + cppMemberName() + QStringLiteral("().get()") + cppToJsonPost();
 }
 
 QString MemberInformationWrapper::jsonElementToDds() const
@@ -86,12 +84,8 @@ QString MemberInformationWrapper::jsonElementToDds() const
     if (isOptional())
         ret += QStringLiteral("if (!val.isNull()) ");
 
-    if (isCppStruct())
+    ret += QStringLiteral("element.") + cppMemberName() + QStringLiteral("(") + cppFromJsonPre2() +
-        ret += QStringLiteral("element.") + cppMemberName() + QStringLiteral(" = ") + cppFromJsonPre2() +
+           QStringLiteral("val") + cppFromJsonPost() + QStringLiteral(")");
-               QStringLiteral("val") + cppFromJsonPost();
-    else
-        ret += QStringLiteral("element.") + cppMemberName() + QStringLiteral("(") + cppFromJsonPre2() +
-               QStringLiteral("val") + cppFromJsonPost() + QStringLiteral(")");
 
     return ret;
 }

qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/codegen_simple.py

@@ -288,6 +288,8 @@ class FtcGenerator(object):
     def generate( self, outfile, parser ):
         outputHeader( outfile, parser, 'FTC' )
         outfile.write('\n')
+        outfile.write('#include <DDS/FTC/generic_ftc_impl.h>\n')
+        outfile.write('\n')
         outfile.write('namespace FTC\n')
         outfile.write('{\n')
         outfile.write('template <typename REQ, typename REP, typename DUMMY> class GenericFtcImpl;\n')

qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_dtc.h.grantlee

@@ -16,10 +16,10 @@
 #include <LtsUtilsCore/data_modification_enum.h>
 
 #include <{{ include_prefix }}/{{ namespace_abbr }}_export.h>
-#include <{{ include_prefix }}/{{ namespace_abbr }}.hpp>
+#include <{{ include_prefix }}/{{ namespace_abbr }}_dtc_types.h>
 
-// Bring Core namespace types into scope for Interface namespace
+// Bring DTC namespace types into scope for Interface namespace
-using namespace {{ namespace }};
+using namespace DTC;
 
 namespace DDSConnector
 {

qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_ftc_impl.h.grantlee

@@ -8,8 +8,8 @@
 {% autoescape off %}
 // filename: {{ namespace_abbr }}_ftc_impl.h
 #pragma once
-#include <{{ include_prefix }}/{{ namespace_abbr }}_ftc.h>
 #include <{{ include_prefix }}/{{ namespace_abbr }}_ftc_types.h>
+#include <{{ include_prefix }}/{{ namespace_abbr }}_ftc.h>
 #include <{{ include_prefix }}/logger.h>
 
 #include <DDS/FTC/abstract_requester.h>

qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/CMakeLists.txt

@@ -34,6 +34,8 @@ NGL_TARGET_LINK_LIBRARIES(LtsSessionDataDds
   PUBLIC
     $<$<BOOL:${BUILD_RTI}>:nddscore>
     $<$<BOOL:${BUILD_RTI}>:ddsQoS>
+    # fournit dds::topic::topic_type_support<Core::*>::register_type
+    $<$<BOOL:${BUILD_RTI}>:$<IF:$<TARGET_EXISTS:ddscore>,ddscore,>>
     NGLLogger
     Qt6::Core
 )
@@ -47,8 +49,10 @@ IF(BUILD_RTI)
   )
   # ddscore target generates core_dtc_types.h
   ADD_DEPENDENCIES(LtsSessionDataDds ddscore)
+  # PUBLIC : nddscore est lie en PUBLIC ci-dessus, donc "-lnddscore" se propage
+  # aux consommateurs ; le repertoire de recherche doit se propager avec lui.
   NGL_TARGET_LINK_DIRECTORIES(LtsSessionDataDds
-    PRIVATE
+    PUBLIC
       ${RTI_LIB_DIR}
   )
 ENDIF()

qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_data_dds.h

@@ -183,8 +183,10 @@ class LTSSESSIONDATADDS_EXPORT LtsSessionDataDds : public QObject
 #ifdef BUILD_RTI
     bool initInternal();
     void onPartitionTimeChangedInternal();
-    static LtsSession::PartitionType toPartitionType(IDL::PartitionType idlType);
+    static ::LtsSession::PartitionType toPartitionType(IDL::PartitionType idlType);
-    static IDL::PartitionType toIdlPartitionType(LtsSession::PartitionType type);
+    // NOTE: toIdlPartitionType est une fonction du namespace anonyme dans le .cpp
+    // (partagee avec DdsConnectionContainer), pas un membre. La declarer ici la
+    // masquait dans les methodes de la classe -> reference non definie a l'edition de liens.
 
     // Member variables - only with RTI
     int m_exerciseId;

qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/EventDelegate.h

@@ -1,6 +1,7 @@
 
 
 #pragma once
+#include "ltstimelineclassic_export.h"
 #include "AbstractTimelineModel.h"
 #include "Range.h"
 
@@ -10,7 +11,7 @@
 namespace LtsTimelineClassic
 {
 
-class EventDelegate : public QStyledItemDelegate
+class LTSTIMELINECLASSIC_EXPORT EventDelegate : public QStyledItemDelegate
 {
     Q_OBJECT
 

qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/PassiveEventContainer.h

@@ -2,6 +2,7 @@
 
 #pragma once
 
+#include "ltstimelineclassic_export.h"
 #include "EventList.h"
 #include "LineMap.h"
 #include "Range.h"
@@ -14,7 +15,7 @@ class QStyleOptionViewItem;
 namespace LtsTimelineClassic
 {
 
-class PassiveEventContainer : public QObject
+class LTSTIMELINECLASSIC_EXPORT PassiveEventContainer : public QObject
 {
     Q_OBJECT
 

qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineHeaderView.h

@@ -1,6 +1,7 @@
 
 
 #pragma once
+#include "ltstimelineclassic_export.h"
 #include "EventTools.h"
 
 #include <QtWidgets/QHeaderView>
@@ -11,7 +12,7 @@ class QPainter;
 namespace LtsTimelineClassic
 {
 
-class TimelineHeaderView : public QHeaderView
+class LTSTIMELINECLASSIC_EXPORT TimelineHeaderView : public QHeaderView
 {
     Q_OBJECT
 

qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineIndicator.h

@@ -1,6 +1,7 @@
 
 
 #pragma once
+#include "ltstimelineclassic_export.h"
 #include "EventTools.h"
 #include "LineMap.h"
 
@@ -23,7 +24,7 @@ namespace LtsTimelineClassic
 
 class TimelineIndicatorTest;
 
-class TimelineIndicator : public QWidget
+class LTSTIMELINECLASSIC_EXPORT TimelineIndicator : public QWidget
 {
     Q_OBJECT
 

qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineView.h

@@ -1,6 +1,7 @@
 
 
 #pragma once
+#include "ltstimelineclassic_export.h"
 #include "AbstractTimelineModel.h"
 #include "LineMap.h"
 #include "Range.h"
@@ -13,7 +14,7 @@
 namespace LtsTimelineClassic
 {
 
-class TimelineView : public QTreeView
+class LTSTIMELINECLASSIC_EXPORT TimelineView : public QTreeView
 {
     Q_OBJECT
 

qt6-after/qt6-migrated-legatus/Lts/DDS/Core/CMakeLists.txt

@@ -54,6 +54,7 @@ TARGET_COMPILE_DEFINITIONS(ddscore PRIVATE
     RTI_UNIX
     RTI_LINUX
     RTI_64BIT
+    MAKE_DDSCORE_LIB
 )
 
 # Skip AUTOMOC for generated header - it will be processed manually with correct dependencies
@@ -105,6 +106,7 @@ SET(SRCS_client
 CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})
 
 NGL_ADD_LIBRARY2(AAR SV WS HLA svcCoreClient SHARED ${SRCS_client})
+TARGET_COMPILE_DEFINITIONS(svcCoreClient PRIVATE MAKE_SVCCORECLIENT_LIB)
 NGL_TARGET_INCLUDE_DIRECTORIES(svcCoreClient
   PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/../../

qt6-after/qt6-migrated-legatus/Lts/DDS/Core/core_dtc.h

@@ -10,6 +10,8 @@
 // filename: core_dtc.h
 #pragma once
 
+#include <compare>
+#include <QtCore/qcompare.h>
 #include <QMap>
 #include <QObject>
 #include <functional>

qt6-after/qt6-migrated-legatus/Lts/DDS/Core/pacemaker.cpp

@@ -15,7 +15,7 @@ namespace Core
 {
 Pacemaker::Pacemaker(DDSConnector::DdsConnector *ddsConnector)
   : QObject(nullptr)
-  , m_logger(NGL::INGLLoggerBootstrap::getNGLLogger("Core.Pacemaker"))
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("Core.Pacemaker"))
 {
     init(ddsConnector);
 }

qt6-after/qt6-migrated-legatus/Lts/DDS/Core/pacemaker.h

@@ -9,11 +9,14 @@
 
 // Forward declarations for moc compatibility (moc doesn't see BUILD_RTI guards)
 namespace Core { enum class RunningState; enum class PortType; }
+#if !BUILD_RTI
+// Only needed when the generated core_dts_types.h (which defines this as an
+// alias template instantiation) is not available.
 namespace DTS { class CurrentRunningStateImpl; }
+#endif
 
 #if BUILD_RTI
-#include <dds/core/core_dts_types.h>
+#include <Core/core_dts_types.h>
-#include <dds/core/types/CurrentRunningState.h>
 #endif
 
 namespace DDSConnector
@@ -65,7 +68,7 @@ class CORE_CLIENT_EXPORT Pacemaker final : public QObject
     void addPortInternal(unsigned short number, Core::PortType portType,
                          const QString& properties = QStringLiteral(""));
 
-    CurrentRunningState m_state;
+    ::Core::CurrentRunningState m_state;
     DTS::CurrentRunningStateImpl* m_dtsCurrentRunningState = nullptr;
 #else
     void* m_reserved1 = nullptr;

qt6-after/qt6-migrated-legatus/Lts/DDS/Core/topic_lock_master.cpp

@@ -32,12 +32,12 @@ bool TopicLockMaster::init(const std::shared_ptr<DDSConnector::DdsConnector> &dd
   });
 
   connect(m_coreDtc.get(), &Interface::Dtc::lockedEntityChanged, this,
-          [this] (const LockedEntity &data, DataModification modType)
+          [this] (const LockedEntity &data, ::DataModification modType)
           {
             key k(data.entityId(), data.exerciseId(), QString::fromStdString(data.entityTypeName()));
-            if (modType == DataModification::eAdded)
+            if (modType == ::DataModification::eAdded)
               m_lockedEntitys << k;
-            else if (modType == DataModification::eRemoved)
+            else if (modType == ::DataModification::eRemoved)
               m_lockedEntitys.remove(k);
           } );
 

qt6-after/qt6-migrated-legatus/Lts/DDS/Core/topic_lock_master.h

@@ -1,7 +1,10 @@
 #pragma once
 
+#include "svccoreclient_export.h"
+
 #include <QtCore/QSet>
 #include <QtCore/QString>
+#include <QtCore/QObject>
 
 #if BUILD_RTI
 #include <Core/core_dtc.h>
@@ -70,7 +73,7 @@ public:
 private:
   QSet<key> m_lockedEntitys;
 #if BUILD_RTI
-  std::shared_ptr<DDS::Core::Interface::Dtc> m_coreDtc;
+  std::shared_ptr<::Core::Interface::Dtc> m_coreDtc;
 #endif
 };
 

qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/generic_ftc_impl.h

@@ -377,8 +377,13 @@ class GenericFtcImpl final : public GenericFtc<TOPICTYPE_REQUEST, TOPICTYPE_REPL
                 {
                     INFO_LOG(m_logger) << "#receiveReply for " << TopicNameHelper::replyTopicTypeName();
 
+                    // Qt 6's Q_ARG yields QMetaMethodArgument, which cannot be mixed with
+                    // the Qt 5 QArgument<T> used here. The topic type is registered under a
+                    // runtime name (see qRegisterMetaType above), so Q_ARG's stringified
+                    // type name is not usable; build the argument the way Q_ARG does.
                     request.replySlot.invoke(m_objToInform, Qt::QueuedConnection,
-                                             QArgument<ReplyTopic>(TopicNameHelper::replyTopicTypeName(), reply.data()),
+                                             QtPrivate::Invoke::argument<ReplyTopic>(
+                                                 TopicNameHelper::replyTopicTypeName(), reply.data()),
                                              Q_ARG(int, request.uniqueId), Q_ARG(bool, !inProgress));
                 }
                 else
@@ -503,6 +508,8 @@ class GenericFtcImpl final : public GenericFtc<TOPICTYPE_REQUEST, TOPICTYPE_REPL
     bool m_dying{false};
     std::string m_partitionType;
     int m_partitionId;
+    // Declared after m_partitionId to match the constructor initialiser order.
+    DDS::LOGGER_T m_logger;
     std::mutex m_requestMutex;
 };
 

qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/CMakeLists.txt

@@ -39,6 +39,7 @@ NGL_TARGET_LINK_LIBRARIES(ddsfts
     ProjectConfig
     ddsQoS
     svcTabCommon
+    svcCoreClient
   PUBLIC
     Qt6::Core
     RTI::nddsc

qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/connext.h

@@ -282,7 +282,7 @@ template <typename REQUEST, typename REPLY> class Requester final : public Reply
     , m_dataReader(nullptr)
     , m_contentFilteredTopic(nullptr)
     , m_curInstanceHandle(dds::core::InstanceHandle::nil())
-    , m_logger(NGL::getNGLLogger("connext.requester"))
+    , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("connext.requester"))
   {
   }
 
@@ -417,6 +417,8 @@ private:
   dds::sub::DataReader<REPLY> m_dataReader;
   dds::topic::ContentFilteredTopic<REPLY> m_contentFilteredTopic;
   dds::core::InstanceHandle m_curInstanceHandle;
+  // Declared last to match the constructor initialiser order.
+  NGL::INGLLogger& m_logger;
 };
 
 template <typename REQUEST, typename REPLY> class Replier final : public ReplyRequestBase<REQUEST, REPLY>
@@ -431,7 +433,7 @@ template <typename REQUEST, typename REPLY> class Replier final : public ReplyRe
     , m_dataReader(dds::sub::DataReader<REQUEST>(replierParams.subscriber(),
                                                  ReplyRequestBase<REQUEST, REPLY>::m_requestTopic,
                                                  replierParams.datareader_qos()))
-    , m_logger(NGL::getNGLLogger("connext.replier"))
+    , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("connext.replier"))
   {
   }
 
@@ -500,6 +502,8 @@ private:
   connext::ReplierParams<REQUEST, REPLY> m_replierParams;
   dds::pub::DataWriter<REPLY> m_dataWriter;
   dds::sub::DataReader<REQUEST> m_dataReader;
+  // Declared last to match the constructor initialiser order.
+  NGL::INGLLogger& m_logger;
 };
 
 } // namespace connext

qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/dynamic_data_reader.h

@@ -12,6 +12,7 @@
 #include <dds/topic/find.hpp>
 #include <rti/core/xtypes/DynamicDataImpl.hpp>
 #include <functional>
+#include <type_traits>
 
 namespace DDSGeneric
 {
@@ -309,6 +310,19 @@ class DynamicDataReader final
         callbackFunc(sample.data(), topicName, sample.info());
     }
 
+    template<typename C>
+    static bool isValid(const C& callbackFunc)
+    {
+        // Generic version for any type - checks if callable/non-null
+        // Use simple pointer check for function pointers, true for other types
+        if constexpr (std::is_pointer_v<C>)
+            return callbackFunc != nullptr;
+        else if constexpr (std::is_function_v<std::remove_pointer_t<C>>)
+            return callbackFunc != nullptr;
+        else
+            return true; // Assume valid for functor objects, std::function, etc.
+    }
+
     static bool isValid(const SubscriberCallback& callbackFunc)
     {
         return callbackFunc != nullptr;

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/CMakeLists.txt

@@ -114,6 +114,10 @@ ENDIF()
 # Create svcPdmCommon library with common sources
 SET(PDM_COMMON_TARGET svcPdmCommon)
 NGL_ADD_LIBRARY(AAR SV WS HLA ${PDM_COMMON_TARGET} SHARED  ${SRCS_common})
+SET_TARGET_PROPERTIES(${PDM_COMMON_TARGET} PROPERTIES
+  CXX_VISIBILITY_PRESET default
+  VISIBILITY_INLINES_HIDDEN OFF
+)
 generate_export_header(${PDM_COMMON_TARGET}
   EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/svcpdmcommon_export.h"
 )

qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsReportDisplay/CMakeLists.txt

@@ -15,7 +15,7 @@ else()
 endif()
 
 
-FIND_PACKAGE(KDReports REQUIRED)
+FIND_PACKAGE(KDReports)
 
 SET(ltsReportDisplay_SRCS
   lts_report_display_widget.h
@@ -29,8 +29,13 @@ if(QT6_GUI_AVAILABLE)
       LtsWidgets
     PUBLIC
       ${Qt6_Widgets}
-      KDReports::KDReports
   )
+  if(TARGET KDReports::KDReports)
+    NGL_TARGET_LINK_LIBRARIES(LtsReportDisplay
+      PUBLIC
+        KDReports::KDReports
+    )
+  endif()
 endif()
 NGL_TARGET_INCLUDE_DIRECTORIES(LtsReportDisplay
   PUBLIC

qt6-after/qt6-migrated-legatus/cmake/MacroRTIDDSGen.cmake

@@ -50,6 +50,10 @@ MACRO(RTIDDSGEN srcList infile)
                      ARGS -E remove ${output_cxx}
                      COMMAND ${RTI_DDSGEN_EXECUTABLE}
                      ARGS -language "C++11"
+                     # Connext 7.7 defaults to the OMG IDL4_CPP mapping, which emits plain
+                     # aggregates with public data members. This codebase is written against
+                     # the accessor-based mapping that was the default in Connext <= 7.5.0.
+                     ARGS -standard DDS_PSM_Cxx
                      ARGS -unboundedSupport
                      ARGS -verbosity 2
                      ARGS -update typefiles

qt6-after/qt6-migrated-legatus/docker_build.sh

@@ -1,29 +1,20 @@
 #!/bin/bash
 set -e
 
-# Run CMake configuration and build inside Docker
+# Run CMake configuration and build inside Docker.
+# Utilise l'image legatus-build:26.04 (dependances pre-installees).
+# Pour la (re)construire :
+#   docker build -f Dockerfile.build -t legatus-build:26.04 .
 docker run --rm \
-  -v /home/torsten/swy/sandbox:/workspace \
+  -v /home/nkana/repo/qt-migration-legatus:/workspace \
-  -v /home/torsten/swy/sandbox/rti_license.dat:/workspace/rti_license.dat \
+  -v /home/nkana/repo/qt-migration-legatus/qt6-after/qt6-migrated-legatus/rti_license.dat:/workspace/rti_license.dat \
-  -w /workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus \
+  -v /home/nkana/repo/external/rti_connext_dds-7.7.0:/opt/rti_connext_dds-7.7.0:ro \
-  ubuntu:26.04 bash -c "
+  -w /workspace/qt6-after/qt6-migrated-legatus \
-    apt-get update -qq && \
+  legatus-build:26.04 bash -c "
-    apt-get install -y -qq \
+    # Set RTI license, DDS path, and Qt6 path
-      build-essential \
+    # (deja definis dans l'image, repris ici pour rester explicite)
-      cmake \
-      libkf6texttemplate-dev \
-      libqt6core6 \
-      libqt6gui6 \
-      libqt6widgets6 \
-      qt6-base-dev \
-      qt6-tools-dev-tools \
-      qt6-tools-dev \
-      qt6-l10n-tools \
-      libgtest-dev \
-      git > /dev/null 2>&1
-
-    # Set RTI license and Qt6 path
     export RTI_LICENSE_FILE=/workspace/rti_license.dat
+    export DDS_PATH=/opt/rti_connext_dds-7.7.0
     export CMAKE_PREFIX_PATH=/opt/Qt/6.10.2/gcc_64
 
     # Clean and configure
@@ -36,5 +27,5 @@ docker run --rm \
       -DBUILD_ARCGIS=OFF \
       -DCMAKE_CXX_STANDARD=17
 
-    make -j8 ddscore ddsftccore ddsQoS ddsconnector ddsfts 2>&1 | tee build.log
+    make -j8 ddscore ddsftccore ddsQoS ddsconnector ddsfts
 "

qt6-after/qt6-migrated-legatus/docker_shell.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+# Shell interactif dans l'image de build (dependances deja installees).
+# Ne supprime PAS build4 : les artefacts deja construits restent utilisables.
+#
+# Si l'image n'existe pas encore :
+#   docker build -f Dockerfile.build -t legatus-build:26.04 .
+exec docker run --rm -it \
+  -v /home/nkana/repo/qt-migration-legatus:/workspace \
+  -v /home/nkana/repo/qt-migration-legatus/qt6-after/qt6-migrated-legatus/rti_license.dat:/workspace/rti_license.dat \
+  -v /home/nkana/repo/external/rti_connext_dds-7.7.0:/opt/rti_connext_dds-7.7.0:ro \
+  -w /workspace/qt6-after/qt6-migrated-legatus \
+  legatus-build:26.04 bash

qt6-after/qt6-migrated-legatus/docker_tests.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+# Compile et lance migration_tests dans l'image de build.
+#
+#   ./docker_tests.sh          -> compile puis lance toute la suite
+#   ./docker_tests.sh build    -> compile seulement
+#   ./docker_tests.sh run      -> lance seulement (binaire deja compile)
+#   ./docker_tests.sh run 'EventTest.*'   -> lance un sous-ensemble (filtre gtest)
+#
+# Prerequis : build4/ existe deja (lancer ./docker_build.sh avant).
+set -e
+
+MODE="${1:-all}"
+FILTER="${2:-*}"
+
+case "$MODE" in
+  build) CMD="make -j8 migration_tests" ;;
+  run)   CMD="./bin/migration_tests --gtest_filter='$FILTER'" ;;
+  all)   CMD="make -j8 migration_tests && ./bin/migration_tests --gtest_filter='$FILTER'" ;;
+  *)     echo "usage: $0 [build|run|all] [filtre_gtest]"; exit 2 ;;
+esac
+
+docker run --rm \
+  -v /home/nkana/repo/qt-migration-legatus:/workspace \
+  -v /home/nkana/repo/qt-migration-legatus/qt6-after/qt6-migrated-legatus/rti_license.dat:/workspace/rti_license.dat \
+  -v /home/nkana/repo/external/rti_connext_dds-7.7.0:/opt/rti_connext_dds-7.7.0:ro \
+  -w /workspace/qt6-after/qt6-migrated-legatus/build4 \
+  legatus-build:26.04 bash -c "export QT_QPA_PLATFORM=offscreen && $CMD"

qt6-after/qt6-migrated-legatus/include/Core/core.hpp

@@ -10,6 +10,13 @@
 
 #pragma once
 
+#if BUILD_RTI
+// RTI build: the real headers live in the generated/DDS tree. This directory is
+// searched first, so hand the lookup on instead of shadowing them with stubs.
+#include_next <Core/core.hpp>
+
+#else
+
 #include <Core/core_types.h>
 #include <Core/core_enums.hpp>
 #include <Core/core_dtc.h>
@@ -105,3 +112,5 @@ inline std::ostream& operator<<(std::ostream& os, const GeoPosition2D& pos)
 }
 
 } // namespace Core
+
+#endif // BUILD_RTI

qt6-after/qt6-migrated-legatus/include/Core/core_dtc.h

@@ -3,6 +3,13 @@
 // STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
 // Für die Migration erstellen wir minimale Forward-Declarations
 
+#if BUILD_RTI
+// RTI build: the real headers live in the generated/DDS tree. This directory is
+// searched first, so hand the lookup on instead of shadowing them with stubs.
+#include_next <Core/core_dtc.h>
+
+#else
+
 namespace DDS
 {
 namespace Core
@@ -14,3 +21,5 @@ class Ftc;
 } // namespace Interface
 } // namespace Core
 } // namespace DDS
+
+#endif // BUILD_RTI

qt6-after/qt6-migrated-legatus/include/Core/core_enums.hpp

@@ -3,6 +3,13 @@
 // STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
 // Für die Migration erstellen wir minimale Typ-Definitionen
 
+#if BUILD_RTI
+// RTI build: the real headers live in the generated/DDS tree. This directory is
+// searched first, so hand the lookup on instead of shadowing them with stubs.
+#include_next <Core/core_enums.hpp>
+
+#else
+
 namespace Core
 {
 // Placeholder enums - werden durch echte DDS-Typen ersetzt
@@ -17,3 +24,5 @@ struct UnitSymbolPosition
     double z = 0.0;
 };
 } // namespace Core
+
+#endif // BUILD_RTI

qt6-after/qt6-migrated-legatus/include/Core/core_types.h

@@ -11,6 +11,14 @@
 #include <vector>
 #include <QtCore/QString>
 
+#if BUILD_RTI
+// RTI build: the real headers live in the generated/DDS tree. This directory is
+// searched first, so hand the lookup on instead of shadowing them with stubs.
+#include <Core/core.hpp>
+#include <Core/function_reply_object.h>
+
+#else
+
 namespace Core
 {
 
@@ -142,3 +150,5 @@ private:
 };
 
 } // namespace Core
+
+#endif // BUILD_RTI

qt6-after/qt6-migrated-legatus/include/DDS/DTC/generic_dtc.h

@@ -8,6 +8,12 @@
 
 #pragma once
 
+#ifdef BUILD_RTI
+// Forward to the real implementation in Lts/DDS/. "include/" is searched
+// before "Lts/", so this header would otherwise shadow it.
+#include_next <DDS/DTC/generic_dtc.h>
+#else
+
 #include <functional>
 #include <string>
 #include <LtsUtilsCore/data_modification_enum.h>
@@ -99,3 +105,5 @@ class DdtcSampleInfo
     std::function<void(const typename DRO_OBJECT::TopicType &, const std::string &, const dds::sub::SampleInfo &)> >
 {};
 }
+
+#endif // BUILD_RTI

qt6-after/qt6-migrated-legatus/include/DDS/DTC/generic_dtc_impl.h

@@ -8,6 +8,12 @@
 
 #pragma once
 
+#ifdef BUILD_RTI
+// Forward to the real implementation in Lts/DDS/. "include/" is searched
+// before "Lts/", so this header would otherwise shadow it.
+#include_next <DDS/DTC/generic_dtc_impl.h>
+#else
+
 #include <DDS/Generic/generic_data_reader.h>
 #include <DDS/Generic/subscriber_listener.h>
 #include <DDS/Generic/generic_logger.h>
@@ -317,3 +323,5 @@ public:
 };
 
 }  // namespace DTC
+
+#endif // BUILD_RTI

qt6-after/qt6-migrated-legatus/include/DDS/Generic/generic_data_reader.h

@@ -4,48 +4,22 @@
  * @file generic_data_reader.h
  * @brief Generic Data Reader wrapper for DDS
  *
- * Provides GenericDataReader template class that wraps RTI DataReader
+ * With BUILD_RTI=ON this forwards to the real implementation in
- * when BUILD_RTI=ON, or provides stub implementation when BUILD_RTI=OFF.
+ * Lts/DDS/Generic/. "include/" is searched before "Lts/", so this header
+ * would otherwise shadow it. With BUILD_RTI=OFF it provides stubs.
  */
 
-#include <dds/sub/subfwd.hpp>
+#ifdef BUILD_RTI
+
+#include_next <DDS/Generic/generic_data_reader.h>
+
+#else
+
+#include <string>
 
 namespace DDSGeneric
 {
 
-#ifdef BUILD_RTI
-// RTI DDS is available - include full DynamicDataReader implementation
-#include <Lts/DDS/Generic/dynamic_data_reader.h>
-
-// Forward declaration stub for DataReader
-// RTI 7.7 signature: template <typename T, template <typename Q> class DELEGATE = dds::sub::detail::DataReaderImpl>
-template<typename T>
-class GenericDataReader {
-public:
-    using DataType = T;
-    using ReaderType = dds::sub::DataReader<T>;
-    
-    // Minimal interface - extend as needed
-    bool has_data() const { return false; }
-    T read_data() { return T{}; }
-    void cleanup() {}
-    
-    // Access to underlying RTI reader if needed
-    ReaderType& reader() { return m_reader; }
-    const ReaderType& reader() const { return m_reader; }
-    
-private:
-    ReaderType m_reader;
-};
-
-template<typename T>
-class GenericDataReaderContentFilter {
-public:
-    using DataType = T;
-    // Minimal stub - extend as needed
-};
-
-#else
 // BUILD_RTI=OFF: Provide minimal stub definitions
 
 namespace dds {
@@ -111,6 +85,6 @@ public:
     bool hasSamples() const { return false; }
 };
 
-#endif // BUILD_RTI
-
 } // namespace DDSGeneric
+
+#endif // BUILD_RTI

qt6-after/qt6-migrated-legatus/tests/CMakeLists.txt

@@ -63,6 +63,27 @@ if(BUILD_TESTING)
         
         # Exclude tests for non-existent or commented-out components
         list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_lts_app_descriptor_editor\\.cpp")
+        # test_lts_app_descriptor.cpp utilise QTEST_MAIN (framework QtTest) : il fournit
+        # son propre main(), qui prend le pas sur GTest::gtest_main et fait echouer la
+        # decouverte des tests. Un binaire QtTest et un binaire gtest ne se melangent pas.
+        # A rebatir comme executable QtTest autonome si sa couverture est souhaitee.
+        list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_lts_app_descriptor\\.cpp")
+        # test_GrantleeParserSmoke.cpp est un doublon-souche : il inclut
+        # Lts/Common/CodeGen/GrantleeParserSmoke.h, qui n'a jamais existe, et ne contient
+        # que des EXPECT_TRUE(true). Le vrai smoke test est l'executable autonome
+        # grantlee_parser_smoke (Lts/Common/CodeGen/tests/GrantleeParserSmoke.cpp,
+        # add_test NAME GrantleeParserSmoke). Aucune couverture perdue.
+        list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_GrantleeParserSmoke\\.cpp")
+        
+        # test_migration_stubs.cpp valide les en-tetes STUB (namespace DDS::Core::Interface,
+        # DDS::DTC, ...) qui n'existent que si BUILD_RTI=OFF. Avec BUILD_RTI=ON les stubs
+        # sont contournes au profit des vrais en-tetes : ce test ne peut pas compiler.
+        if(BUILD_RTI)
+            list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_migration_stubs\\.cpp")
+            # test_build_rti_guards.cpp affirme EXPECT_FALSE(rti_available) : il valide
+            # le repli BUILD_RTI=OFF et echoue par construction quand RTI est actif.
+            list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_build_rti_guards\\.cpp")
+        endif()
 
         # Exclude Grantlee-related tests when BUILD_GRANTLEE is OFF
         if(NOT BUILD_GRANTLEE)
@@ -91,25 +112,77 @@ if(BUILD_TESTING)
             return()
         endif()
 
+        # Le CMakeLists racine pose -DQT_NO_CAST_FROM_ASCII (CMakeLists.txt:546) pour
+        # interdire les conversions implicites const char* -> QString dans le code de
+        # production. Plusieurs tests (test_qt6_api_migrations, test_qt6_compatibility)
+        # ont justement pour objet d'exercer ces conversions : les reecrire en
+        # QStringLiteral changerait ce qu'ils verifient. On leve donc le garde pour ce
+        # repertoire de tests uniquement ; le code de production reste protege.
+        get_directory_property(_migtest_defs COMPILE_DEFINITIONS)
+        if(_migtest_defs)
+            list(REMOVE_ITEM _migtest_defs QT_NO_CAST_FROM_ASCII)
+            set_directory_properties(PROPERTIES COMPILE_DEFINITIONS "${_migtest_defs}")
+        endif()
+
+        # main() maison : cree la QApplication requise par les tests de widgets
+        list(APPEND EXISTING_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/gtest_qt_main.cpp")
+
         add_executable(migration_tests ${EXISTING_SOURCES})
 
+        # test_export_headers.cpp verifie la presence d'en-tetes generes : il doit
+        # connaitre le nom reel du repertoire de build (il supposait "build").
+        target_compile_definitions(migration_tests PRIVATE
+            MIGRATION_TESTS_BUILD_DIR="${CMAKE_BINARY_DIR}")
+        
         # Enable Qt Meta-Object Compiler for tests with Q_OBJECT
         set_target_properties(migration_tests PROPERTIES AUTOMOC ON)
         
         target_compile_features(migration_tests PRIVATE cxx_std_23)
         
         target_include_directories(migration_tests PRIVATE
+            # CMAKE_SOURCE_DIR vaut deja .../qt6-after/qt6-migrated-legatus : les
+            # variantes prefixees une seconde fois pointaient dans le vide (les deux
+            # premieres doublonnaient d'ailleurs les lignes ci-dessus).
             ${CMAKE_SOURCE_DIR}
             ${CMAKE_SOURCE_DIR}/include
-            ${CMAKE_SOURCE_DIR}/qt6-after/qt6-migrated-legatus
+            ${CMAKE_SOURCE_DIR}/DDS
-            ${CMAKE_SOURCE_DIR}/qt6-after/qt6-migrated-legatus/include
+            # En-tetes generes, inclus sous forme qualifiee par service
-            ${CMAKE_SOURCE_DIR}/qt6-after/qt6-migrated-legatus/DDS
+            # (ex. <ProjectDataManagement/pdm_types.h>, <AlarmManagement/alm_dtc.h>).
+            ${CMAKE_SOURCE_DIR}/Lts
+            ${CMAKE_BINARY_DIR}/Lts
+            ${CMAKE_BINARY_DIR}/Lts/Services
+            ${CMAKE_BINARY_DIR}/Lts/Proxies
+            ${CMAKE_BINARY_DIR}/Lts/DDS
             ${CMAKE_BINARY_DIR}/Lts/Common
             ${CMAKE_BINARY_DIR}/Lts/Common/CodeGen
             ${CMAKE_BINARY_DIR}/Lts/Common/LtsTimeline
             ${CMAKE_BINARY_DIR}/Lts/Common/LtsTimelineClassic
         )
 
+        # Les en-tetes *_export.h generes sont inclus sous forme nue
+        # (ex. <ismshared_export.h>) et vivent chacun dans le repertoire de build
+        # de leur cible : une centaine de repertoires. On les collecte au lieu de
+        # les enumerer. GLOB est evalue a la configuration, apres generate_export_header.
+        file(GLOB_RECURSE _migtest_export_headers "${CMAKE_BINARY_DIR}/*_export.h")
+        set(_migtest_export_dirs "")
+        foreach(_h IN LISTS _migtest_export_headers)
+            get_filename_component(_d "${_h}" DIRECTORY)
+            list(APPEND _migtest_export_dirs "${_d}")
+        endforeach()
+        list(REMOVE_DUPLICATES _migtest_export_dirs)
+        list(LENGTH _migtest_export_dirs _migtest_export_count)
+        message(STATUS "Migration tests: ${_migtest_export_count} repertoires d'en-tetes _export.h")
+        target_include_directories(migration_tests PRIVATE ${_migtest_export_dirs})
+        
+        # NGLLogger exporte Z/src/NGLLogger en PUBLIC : c'est le repertoire de
+        # NGLLoggerBootstrap.h, inclus par Lts/Common/LtsTimelineClassic/Event.h.
+        if(TARGET NGLLogger)
+            target_link_libraries(migration_tests PRIVATE NGLLogger)
+        else()
+            message(WARNING "migration_tests: cible NGLLogger absente, "
+                            "les tests LtsTimelineClassic ne compileront pas")
+        endif()
+
         # Link against Qt6 components
 if(QT6_GUI_AVAILABLE)
           target_link_libraries(migration_tests PRIVATE
@@ -117,7 +190,7 @@ if(QT6_GUI_AVAILABLE)
               Qt6::Gui
               Qt6::Widgets
               Qt6::Test
-              GTest::gtest_main
+              GTest::gtest   # pas gtest_main : le main() est dans gtest_qt_main.cpp
           )
 endif()
         
@@ -132,8 +205,21 @@ endif()
         # Grantlee tests require BUILD_GRANTLEE=ON
         if(BUILD_GRANTLEE)
             target_link_libraries(migration_tests PRIVATE codegen_grantlee)
+            # KF6::TextTemplate porte les INTERFACE_INCLUDE_DIRECTORIES de
+            # <ktexttemplate/template.h>, inclus par GeneratorGrantleeBase.h.
+            # Le FIND_PACKAGE de Lts/Common/CodeGen cree une cible importee limitee
+            # a ce repertoire : il faut la re-chercher ici pour l'avoir dans ce scope.
+            find_package(KF6TextTemplate QUIET)
+            if(TARGET KF6::TextTemplate)
+                target_link_libraries(migration_tests PRIVATE KF6::TextTemplate)
+            else()
+                message(WARNING "migration_tests: KF6::TextTemplate introuvable, "
+                                "les tests Grantlee ne compileront pas")
+            endif()
+            # CMAKE_SOURCE_DIR vaut deja .../qt6-after/qt6-migrated-legatus :
+            # le prefixe repete donnait un chemin inexistant.
             target_include_directories(migration_tests PRIVATE
-                ${CMAKE_SOURCE_DIR}/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen
+                ${CMAKE_SOURCE_DIR}/Lts/Common/CodeGen
             )
             message(STATUS "Migration tests: Grantlee support enabled")
         endif()

qt6-after/qt6-migrated-legatus/tests/gtest_qt_main.cpp

@@ -0,0 +1,26 @@
+/**
+ * @file gtest_qt_main.cpp
+ * @brief Point d'entree de migration_tests.
+ *
+ * GTest::gtest_main fournit un main() qui ne cree aucune QApplication. Or les tests
+ * de widgets (EventDelegate, TimelineView, ...) en instancient, et Qt abandonne avec
+ * "QWidget: Must construct a QApplication before a QWidget". On fournit donc notre
+ * propre main() : QApplication d'abord, gtest ensuite.
+ *
+ * En environnement sans affichage, lancer avec QT_QPA_PLATFORM=offscreen.
+ */
+
+#include <gtest/gtest.h>
+
+#include <NGLLogger/NGLLoggerBootstrap.h>
+#include <QtWidgets/QApplication>
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+    
+    NGL::NGLLoggerBootstrap::createNGLRootLogger(QString(), true, QString(), /*quiet=*/true);
+
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}

qt6-after/qt6-migrated-legatus/tests/test_event.cpp

@@ -17,9 +17,9 @@ class EventTest : public ::testing::Test
 
 TEST(EventTest, ConstructorInitializesMembers)
 {
-    QStringList path = {"actuator", "subactuator"};
+    QStringList path = {QStringLiteral("actuator"), QStringLiteral("subactuator")};
     QJsonObject detailData;
-    detailData["key"] = "value";
+    detailData[QStringLiteral("key")] = QStringLiteral("value");
     QColor color(Qt::red);
 
     Event event(1, 2, 1000, 2000, 3, 4, 5, path, nullptr, color, detailData);

qt6-after/qt6-migrated-legatus/tests/test_export_headers.cpp

@@ -7,6 +7,11 @@
  * so we test header existence and structure rather than macro expansion.
  */
 
+#ifndef MIGRATION_TESTS_BUILD_DIR
+// Repertoire de build reel, fourni par tests/CMakeLists.txt.
+#define MIGRATION_TESTS_BUILD_DIR "build"
+#endif
+
 #include <fstream>
 #include <gtest/gtest.h>
 #include <string>
@@ -33,28 +38,28 @@ std::string readFile(const std::string& path)
 // Test 1: nglwidgets_export.h exists
 TEST(ExportHeaders, NglWidgetsExportExists)
 {
-    std::string path = "build/Z/src/nglwidgets/nglwidgets_export.h";
+    std::string path = MIGRATION_TESTS_BUILD_DIR "/Z/src/nglwidgets/nglwidgets_export.h";
     EXPECT_TRUE(fileExists(path)) << "Export header not found: " << path;
 }
 
 // Test 2: qtsingleapplication_export.h exists
 TEST(ExportHeaders, QtSingleApplicationExportExists)
 {
-    std::string path = "build/Z/src/QtSingleApplication/qtsingleapplication_export.h";
+    std::string path = MIGRATION_TESTS_BUILD_DIR "/Z/src/QtSingleApplication/qtsingleapplication_export.h";
     EXPECT_TRUE(fileExists(path)) << "Export header not found: " << path;
 }
 
 // Test 3: ltssessiondata_export.h exists
 TEST(ExportHeaders, LtsSessionDataExportExists)
 {
-    std::string path = "build/Lts/Common/LtsSession/ltssessiondata_export.h";
+    std::string path = MIGRATION_TESTS_BUILD_DIR "/Lts/Common/LtsSession/ltssessiondata_export.h";
     EXPECT_TRUE(fileExists(path)) << "Export header not found: " << path;
 }
 
 // Test 4: svcgmpserver_export.h exists
 TEST(ExportHeaders, SvcGmpServerExportExists)
 {
-    std::string path = "build/Lts/Services/GuezMinelayerProcessing/svcgmpserver_export.h";
+    std::string path = MIGRATION_TESTS_BUILD_DIR "/Lts/Services/GuezMinelayerProcessing/svcgmpserver_export.h";
     EXPECT_TRUE(fileExists(path)) << "Export header not found: " << path;
 }
 
@@ -62,8 +67,8 @@ TEST(ExportHeaders, SvcGmpServerExportExists)
 TEST(ExportHeaders, HaveIncludeGuards)
 {
     std::vector<std::string> headers = {
-        "build/Z/src/nglwidgets/nglwidgets_export.h", "build/Z/src/QtSingleApplication/qtsingleapplication_export.h",
+        MIGRATION_TESTS_BUILD_DIR "/Z/src/nglwidgets/nglwidgets_export.h", MIGRATION_TESTS_BUILD_DIR "/Z/src/QtSingleApplication/qtsingleapplication_export.h",
-        "build/Lts/Common/LtsSession/ltssessiondata_export.h", "build/Lts/Proxies/ProjectDataManagement/pdm_export.h"};
+        MIGRATION_TESTS_BUILD_DIR "/Lts/Common/LtsSession/ltssessiondata_export.h", MIGRATION_TESTS_BUILD_DIR "/Lts/Proxies/ProjectDataManagement/pdm_export.h"};
 
     for (const auto& header : headers)
     {
@@ -85,7 +90,7 @@ TEST(ExportHeaders, MacroNamingConvention)
 {
     // Check that export headers follow CMake naming convention
     std::string adlerPath =
-        "qt-migration-legatus/qt6-after/qt6-migrated-legatus/build/Lts/Plugins/AdlerJson/adler_export.h";
+        MIGRATION_TESTS_BUILD_DIR "/Lts/Plugins/AdlerJson/adler_export.h";
     std::string content = readFile(adlerPath);
 
     if (!content.empty())
@@ -100,7 +105,7 @@ TEST(ExportHeaders, MacroNamingConvention)
 TEST(ExportHeaders, ExportAndNoExportMacros)
 {
     std::vector<std::pair<std::string, std::string>> expectedMacros = {
-        {"qt-migration-legatus/qt6-after/qt6-migrated-legatus/build/Lts/Plugins/AdlerJson/adler_export.h", "ADLER"},
+        {MIGRATION_TESTS_BUILD_DIR "/Lts/Plugins/AdlerJson/adler_export.h", "ADLER"},
         {"qt-migration-legatus/qt6-after/qt6-migrated-legatus/build/Lts/Services/PresentationManagement/"
          "svcprecommon_export.h",
          "SVCPRECOMMON"},

qt6-after/qt6-migrated-legatus/tests/test_item.cpp

@@ -23,15 +23,15 @@ TEST(ItemTest, HeaderCompilesAndLinks)
 TEST(ItemTest, CanInstantiateItem)
 {
     // Basic instantiation test
-    Item item("TestItem", "test-id");
+    Item item(QStringLiteral("TestItem"), QStringLiteral("test-id"));
-    EXPECT_EQ(item.getName(), "TestItem");
+    EXPECT_EQ(item.getName(), QStringLiteral("TestItem"));
-    EXPECT_EQ(item.getIdentifier(), "test-id");
+    EXPECT_EQ(item.getIdentifier(), QStringLiteral("test-id"));
 }
 
 TEST(ItemTest, ItemHasValidState)
 {
-    Item parent("Parent");
+    Item parent(QStringLiteral("Parent"));
-    Item child("Child");
+    Item child(QStringLiteral("Child"));
     
     // Test parent-child relationship
     child.setParent(&parent);

qt6-after/qt6-migrated-legatus/tests/test_lts_app_descriptor.cpp

@@ -22,11 +22,11 @@ class TestLtsAppDescriptor : public QObject
 void TestLtsAppDescriptor::testPluginInfoCreation()
 {
     PluginInfo pluginInfo;
-    pluginInfo.iid = "test.plugin.iid";
+    pluginInfo.iid = QStringLiteral("test.plugin.iid");
     pluginInfo.type = PluginInfo::PluginType::GUI;
     pluginInfo.flags = PluginInfo::Flag::UNKNOWN;
 
-    QCOMPARE(pluginInfo.iid, QString("test.plugin.iid"));
+    QCOMPARE(pluginInfo.iid, QStringLiteral("test.plugin.iid"));
     QCOMPARE(pluginInfo.type, PluginInfo::PluginType::GUI);
 }
 

qt6-after/qt6-migrated-legatus/tests/test_ltswidgets_qt6.cpp

@@ -17,18 +17,16 @@
 #include <QtGui/QWheelEvent>
 #include <gtest/gtest.h>
 
-// Ensure QApplication is initialized for widget tests
+// La QApplication est desormais creee par le main() de la suite (gtest_qt_main.cpp).
-static bool appInitialized = false;
+//
-
+// Ce fichier en creait une seconde, en statique locale : Qt n'admet qu'une instance,
+// et celle-ci etait detruite par exit() APRES celle du main(), d'ou un SIGSEGV dans
+// ~QGuiApplication a l'extinction du processus. On se contente donc de verifier
+// qu'une instance existe.
 static void ensureAppInitialized()
 {
-    if (!appInitialized)
+    ASSERT_NE(QCoreApplication::instance(), nullptr)
-    {
+        << "QApplication absente : elle doit etre creee par gtest_qt_main.cpp";
-        static int argc = 1;
-        static char* argv[] = {(char*)"test_ltswidgets_qt6", nullptr};
-        static QApplication app(argc, argv);
-        appInitialized = true;
-    }
 }
 
 // Test 1: QRandomGenerator bounded generation (used in lts_tab_widget.cpp)
@@ -90,9 +88,9 @@ TEST(LtsWidgetsQt6, QComboBoxCurrentTextChangedSignal)
     ensureAppInitialized();
 
     QComboBox comboBox;
-    comboBox.addItem("Option1");
+    comboBox.addItem(QStringLiteral("Option1"));
-    comboBox.addItem("Option2");
+    comboBox.addItem(QStringLiteral("Option2"));
-    comboBox.addItem("Option3");
+    comboBox.addItem(QStringLiteral("Option3"));
 
     bool signalReceived = false;
     QString receivedText;
@@ -105,7 +103,7 @@ TEST(LtsWidgetsQt6, QComboBoxCurrentTextChangedSignal)
     comboBox.setCurrentIndex(1);
 
     EXPECT_TRUE(signalReceived);
-    EXPECT_EQ(receivedText, "Option2");
+    EXPECT_EQ(receivedText, QStringLiteral("Option2"));
 }
 
 // Test 5: QComboBox activated signal with int parameter (Qt6)
@@ -115,9 +113,9 @@ TEST(LtsWidgetsQt6, QComboBoxActivatedIntSignal)
     ensureAppInitialized();
 
     QComboBox comboBox;
-    comboBox.addItem("First");
+    comboBox.addItem(QStringLiteral("First"));
-    comboBox.addItem("Second");
+    comboBox.addItem(QStringLiteral("Second"));
-    comboBox.addItem("Third");
+    comboBox.addItem(QStringLiteral("Third"));
 
     bool signalReceived = false;
     int receivedIndex = -1;
@@ -145,7 +143,7 @@ TEST(LtsWidgetsQt6, QStyleOptionInitFrom)
 {
     ensureAppInitialized();
 
-    QPushButton button("Test");
+    QPushButton button(QStringLiteral("Test"));
     button.resize(100, 30);
     button.setEnabled(true);
 
@@ -163,8 +161,8 @@ TEST(LtsWidgetsQt6, QStyleOptionInitFromMultipleWidgets)
 {
     ensureAppInitialized();
 
-    QPushButton button1("Btn1");
+    QPushButton button1(QStringLiteral("Btn1"));
-    QPushButton button2("Btn2");
+    QPushButton button2(QStringLiteral("Btn2"));
     button1.setEnabled(true);
     button2.setEnabled(false);
 

qt6-after/qt6-migrated-legatus/tests/test_passiveeventcontainer.cpp

@@ -27,17 +27,14 @@ TEST(PassiveEventContainerTest, CreateContainer)
 
 TEST(PassiveEventContainerTest, SetEventList)
 {
+    Event event1(1, 100, 0, 1000, -1, -1, -1, QStringList() << QStringLiteral("path1"), nullptr, Qt::red, QJsonObject(), -1, LtsUtils::QPoint3D());
+    Event event2(2, 100, 500, 1500, -1, -1, -1, QStringList() << QStringLiteral("path2"), nullptr, Qt::blue, QJsonObject(), -1, LtsUtils::QPoint3D());
+
     PassiveEventContainer container(false);
 
-    Event event1(1, 100, 0, 1000, -1, -1, -1, QStringList() << "path1", nullptr, Qt::red, QJsonObject(), -1, LtsUtils::QPoint3D());
-    Event event2(2, 100, 500, 1500, -1, -1, -1, QStringList() << "path2", nullptr, Qt::blue, QJsonObject(), -1, LtsUtils::QPoint3D());
-
-    EventGraphic graphic1(&event1);
-    EventGraphic graphic2(&event2);
-
     EventGraphicList list;
-    list.append(&graphic1);
+    list.append(new EventGraphic(&event1));
-    list.append(&graphic2);
+    list.append(new EventGraphic(&event2));
 
     container.setEventList(list);
 
@@ -46,13 +43,12 @@ TEST(PassiveEventContainerTest, SetEventList)
 
 TEST(PassiveEventContainerTest, PaintDoesNotCrash)
 {
+    Event event1(1, 100, 0, 1000, -1, -1, -1, QStringList() << QStringLiteral("path1"), nullptr, Qt::red, QJsonObject(), -1, LtsUtils::QPoint3D());
+
     PassiveEventContainer container(false);
 
-    Event event1(1, 100, 0, 1000, -1, -1, -1, QStringList() << "path1", nullptr, Qt::red, QJsonObject(), -1, LtsUtils::QPoint3D());
-    EventGraphic graphic1(&event1);
-
     EventGraphicList list;
-    list.append(&graphic1);
+    list.append(new EventGraphic(&event1));
     container.setEventList(list);
 
     EventTools::setValues(0, 1000, 0, 500);

qt6-after/qt6-migrated-legatus/tests/test_pdm_dtc.cpp

@@ -5,7 +5,7 @@
  * This test verifies that the migrated header compiles correctly with Qt6/C++23.
  */
 
-#include "include/ProjectDataManagement/pdm_dtc.h"
+#include "ProjectDataManagement/pdm_dtc.h"
 
 #include <gtest/gtest.h>
 

qt6-after/qt6-migrated-legatus/tests/test_testtimelinemodel.cpp

@@ -10,7 +10,7 @@ namespace LtsTimelineClassic
 {
 
 // Helper to create test Event with minimal parameters
-static Event* createTestEvent()
+static Event* createTestEvent(const QString& actuator = QStringLiteral("test"))
 {
     return new Event(1,                          // uniqueId
                      1,                          // typeId
@@ -19,7 +19,7 @@ static Event* createTestEvent()
                      1,                          // playerId
                      1,                          // partyId
                      1,                          // equipmentId
-                     QStringList{"test"},        // path
+                     QStringList{actuator},      // path
                      Event::drawCustomEventGraphicRect, // paintFunc
                      QColor(Qt::red),            // paintColor
                      QJsonObject());             // detailData
@@ -56,9 +56,9 @@ TEST(TestTimelineModelTest, MultipleEventsCanBeAdded)
     TestTimelineModel model;
     int initialCount = model.rowCount();
 
-    Event* event1 = createTestEvent();
+    Event* event1 = createTestEvent(QStringLiteral("actuator1"));
-    Event* event2 = createTestEvent();
+    Event* event2 = createTestEvent(QStringLiteral("actuator2"));
-    Event* event3 = createTestEvent();
+    Event* event3 = createTestEvent(QStringLiteral("actuator3"));
 
     model.addTestEvent(event1);
     model.addTestEvent(event2);