Removes deleted files

Renames readme file
2026-11-13 15:24:03 +00:00 · 2026-11-13 15:23:00 +00:00 · 2026-11-13 15:18:41 +00:00 · 2026-11-13 14:37:16 +00:00 · 2026-11-13 14:36:48 +00:00 · 2026-11-13 08:46:45 +00:00
2506 changed files with 184785 additions and 23903 deletions
@@ -9,3 +9,21 @@ fix_qt6_gui_deps.py
 fix_rti_conditionals.py
 fix_target_checks.py
 build
+__pycache__/
+add_logger_bootstrap_include.py
+aqtinstall.log
+ces_fix.py
+ces_pass2.py
+fix_additem_enum.py
+fix_broken_includes.py
+fix_enum_as_int.py
+fix_enums.py
+fix_logger_init.py
+fix_logger_remnant.py
+fix_members.py
+fix_mlogger.py
+fix_pdm_combo.py
+fix_sco.py
+restore_underlying.py
+../../restore_ppm_dtc.py
+*.py
@@ -27,9 +27,11 @@ RUN apt-get update && \
      libpq-dev \
      libbz2-dev \
      libboost-all-dev \
+      libglib2.0-dev \
      libxml2-dev \
      libssl-dev \
-      libcurl4-openssl-dev && \
+      libcurl4-openssl-dev \
+      libkf6texttemplate-dev && \
    rm -rf /var/lib/apt/lists/*

 # Install Qt 6.10.2 via aqtinstall
@@ -52,6 +54,7 @@ RUN git clone --depth 1 https://github.com/MEONMedical/Log4Qt.git /tmp/log4qt &&
          -DBUILD_SHARED_LIBS=ON .. && \
    cmake --build . -- -j$(nproc) && \
    cmake --install . && \
+    sed -i 's/return (mThreshold <= level);/return (mThreshold.load() <= level);/' /usr/local/include/log4qt/appenderskeleton.h && \
    rm -rf /tmp/log4qt

 # Create minimal CMake config for Log4Qt
@@ -81,8 +84,27 @@ ENV QT_QPA_PLATFORM=offscreen
 # Configure git for containerized environments
 RUN git config --global --add safe.directory "*"

-# Setup RTI Connext license (developer license file)
-COPY rti_license.dat /root/rti_license.dat
-ENV RTI_LICENSE_FILE=/root/rti_license.dat
+# Configure internal SCM repository for external dependencies
+RUN echo "deb [trusted=yes] http://remote-repo.sl.defence-elec.de:8081/repository/external-rpms/general/ ./" > /etc/apt/sources.list.d/scm-external.list
+
+# Install external dependencies from DEB packages
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    libavs-dev \
+    libarcgis-dev \
+    libbuildingmodels-dev \
+    libgeographiclib-dev \
+    libschusstafel-dev \
+    libdtentity-dev \
+    librti-connext-dds-7.7.0-dev \
+    libtmsif-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+# Setup RTI Connext license (included in DEB package)
+ENV RTI_LICENSE_FILE=/opt/rti_connext_dds-7.7.0/rti_license.dat
+ENV RTI_CONNEXT_HOME=/opt/rti_connext_dds-7.7.0
+ENV NDDSHOME=/opt/rti_connext_dds-7.7.0
+ENV PATH=/opt/rti_connext_dds-7.7.0/bin:$PATH
+ENV LD_LIBRARY_PATH=/opt/rti_connext_dds-7.7.0/lib/x64Linux4gcc7.3.0:$LD_LIBRARY_PATH
+ENV CMAKE_PREFIX_PATH=/opt/rti_connext_dds-7.7.0/lib/cmake:$CMAKE_PREFIX_PATH

 WORKDIR /workspace
@@ -1 +1,2 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ6kKREEjPzWMq8zjhIUCeiPI1MtwVHiZHaKxkePmW4t berrux.kana@axilinx.com
+torsten.wierschin@life-maps.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMV8yH39fMOQE5BeCsxI8RMUXbDBJvRuS5phTTfrXF0H
+berrux.kana@axilinx.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ6kKREEjPzWMq8zjhIUCeiPI1MtwVHiZHaKxkePmW4t berrux.kana@axilinx.com
@@ -1,4 +1,4 @@
 # export MIGRATE_PIPELINE_ROOT="/home/torsten/sandbox/qt6-migration-pipeline"
-export MIGRATE_PIPELINE_ROOT="/home/nkana/repo/qt6-migration-pipeline"
+export MIGRATE_PIPELINE_ROOT="/home/torsten/sandbox/qt6-migration-pipeline"
 export LANG=C.UTF-8
 export LC_ALL=C.UTF-8
@@ -14,3 +14,4 @@ build/
 build2/
 .envrc
 build4
+deb_build_tmp
@@ -18,6 +18,10 @@ ENDIF()
 IF(POLICY CMP0072)
  CMAKE_POLICY(SET CMP0072 NEW) # cmake >= 3.11.0 - prefer libOpenGL.so over legacy libGL.so
 ENDIF()
+# Set policy CMP0111 unconditionally - imported targets require location property
+IF(POLICY CMP0111)
+  CMAKE_POLICY(SET CMP0111 NEW)
+ENDIF()


 IF(NOT DEFINED CMAKE_INSTALL_PREFIX)
@@ -40,6 +44,11 @@ MESSAGE(STATUS "LTS Version: ${LTS_VERSION_MAJOR}.${LTS_VERSION_MINOR}.${LTS_VER
 # Enable CTest integration for unit tests
 include(CTest)

+# Set RPATH to find libraries in build directory
+SET(CMAKE_BUILD_RPATH "${CMAKE_BINARY_DIR}/lib")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_BINARY_DIR}/lib")
+SET(CMAKE_BUILD_RPATH_USE_ORIGIN ON)
+
 function(NGL_ADD_SUBDIR_GUARDED subdir)
  if(MIGRATE_MODULE STREQUAL "")
    add_subdirectory(${subdir})
@@ -82,6 +91,9 @@ SET(CMAKE_INCLUDE_CURRENT_DIR ON)
 # (The qt5 legacy has no include/ tree; Lts/ is the real include root.)
 include_directories(BEFORE ${CMAKE_SOURCE_DIR}/Lts)
 include_directories(${CMAKE_SOURCE_DIR}/include)
+# Legacy also used source-root-relative includes (<Lts/Services/<Svc>/logger.h>, ...);
+# the source root must be an include root so those resolve.
+include_directories(${CMAKE_SOURCE_DIR})
 # Include directory for generated export headers
 include_directories(${CMAKE_BINARY_DIR})
 include_directories(${CMAKE_SOURCE_DIR}/Z/src)
@@ -89,10 +101,28 @@ include_directories(${CMAKE_SOURCE_DIR}/Z/src)
 include_directories(${CMAKE_SOURCE_DIR}/Z/src)
 include_directories(${CMAKE_SOURCE_DIR}/Z/src/ngltools)
 include_directories(${CMAKE_SOURCE_DIR}/Lts/Viewer/SituationMap/Symbology)
+# <Symbology/...> headers (symbol_dictionary.h, sidc_codec.h, ...) are consumed tree-wide
+# (e.g. AdvancedSymbology/asb_data_plugin_interface.h is pulled into PpmCommon), so the
+# parent dir must be a global root too, not only on the AdvancedSymbology target.
+include_directories(${CMAKE_SOURCE_DIR}/Lts/Viewer/SituationMap)
+# Generated SymbologyGui/advancedsymbologygui_export.h lives in the build dir; the source
+# SituationMap root above only covers the source Symbology headers.
+include_directories(${CMAKE_BINARY_DIR}/Lts/Viewer/SituationMap)
 include_directories(${CMAKE_SOURCE_DIR}/Lts/Viewer/LtsDataView)
 include_directories(${CMAKE_SOURCE_DIR}/Lts/Proxies/TrainingAreaBase)
 include_directories(${CMAKE_BINARY_DIR}/Lts/Services/ProjectDataManagement)
 include_directories(${CMAKE_SOURCE_DIR}/Lts/Services)
+# Consumers include generated DDS service headers by service-prefixed name
+# (<ParticipantManagement/ppm.hpp>, <GuezNasat/gna_dtc.h>, ...). Those headers
+# live in the per-service BUILD dirs, so the binary Lts/Services ROOT must be
+# visible tree-wide (the per-service build dirs below only satisfy the bare
+# <ppm.hpp> form). Placed right after the source Lts/Services so a header
+# present in both still resolves to the source (binary only supplies the
+# generated headers). This mirrors the legacy <Services/...> form.
+include_directories(${CMAKE_BINARY_DIR}/Lts/Services)
+# Generated DDS headers for Proxies (GuezNasat/gna_dtc.h, ...) live under the binary
+# Lts/Proxies dir; consumers include them by proxy-prefixed name (<GuezNasat/gna_dtc.h>).
+include_directories(${CMAKE_BINARY_DIR}/Lts/Proxies)
 include_directories(${CMAKE_SOURCE_DIR}/include/ProjectDataManagement)
 include_directories(${CMAKE_BINARY_DIR}/Lts/Services/InfrastructureManagement)
 include_directories(${CMAKE_SOURCE_DIR}/include/InfrastructureManagement)
@@ -119,13 +149,12 @@ include_directories(${CMAKE_SOURCE_DIR}/include/SituationReplay)
 # like the services above. There is no include/Evaluations stub tree, so only the build dir
 # is added (same shape as FileManagement above, which has no stub tree either).
 include_directories(${CMAKE_BINARY_DIR}/Lts/Services/Evaluations)
-include_directories(${CMAKE_SOURCE_DIR}/include/Buildings)
 include_directories(${CMAKE_SOURCE_DIR}/Lts/Proxies/GuezNasat)
+# GuezNasat's generated export header (svcgnacommon_export.h) lives in the build dir;
+# logger.h includes it by bare name, so the build dir must be visible tree-wide.
+include_directories(${CMAKE_BINARY_DIR}/Lts/Proxies/GuezNasat)
 include_directories(${CMAKE_SOURCE_DIR}/Lts/DDS)
 include_directories(${CMAKE_SOURCE_DIR}/Lts/DDS/QosProfile)
-include_directories(${CMAKE_SOURCE_DIR}/include/DDS)
-include_directories(${CMAKE_SOURCE_DIR}/include/DDS/Generic)
-include_directories(${CMAKE_SOURCE_DIR}/include/TrainingAreaBaseOC)
 # Generated DDS headers (BUILD_RTI=ON)
 include_directories(${CMAKE_BINARY_DIR}/Lts)
 # <Core/core.hpp> consumers (LtsCoordinate, AES/CES, HLA proxies) resolve the
@@ -141,6 +170,9 @@ include_directories(${CMAKE_BINARY_DIR}/Lts/Common/LtsUtils/LtsUtilsCore)
 # directory holding the generated header has to be visible tree-wide. The directory contains
 # only that generated header, so appending it cannot shadow an existing include.
 include_directories(${CMAKE_BINARY_DIR}/Lts/Common/LtsUtils/LtsUtilsSettings)
+# LtsUtilsGui ConnectDialog's generated ltsutilsguiconnectdialog_export.h is included by bare
+# name from connect_dialog.h / connect_dialog_nt.h; same tree-wide visibility as the dirs above.
+include_directories(${CMAKE_BINARY_DIR}/Lts/Common/LtsUtils/LtsUtilsGui/ConnectDialog)
 # DDSConnector's generated ddsconnector_export.h is included by bare name from
 # dds_connector.h and pub_sub_base.h, and reaches targets (the AES ModuleTests) that include
 # DDSConnector headers without linking ddsconnector. Same shape as LtsUtilsSettings above: the
@@ -165,7 +197,6 @@ include_directories(${CMAKE_BINARY_DIR}/Lts/Services/OperatorManagement)
 # before: every include that resolves today is found in an earlier directory, so no existing
 # resolution can change.
 include_directories(${CMAKE_SOURCE_DIR}/Lts/Plugins)
-include_directories(${CMAKE_SOURCE_DIR}/forward-declarations)
 SET(CMAKE_CXX_STANDARD 17)
 SET(CMAKE_CXX_STANDARD_REQUIRED ON)
 SET(CMAKE_VISIBILITY_INLINES_HIDDEN ON)
@@ -191,11 +222,18 @@ OPTION(BUILD_PLUGINS_PARTICIPANT_ORG_CHART "Build ParticipantOrgChart (requires
 OPTION(BUILD_PLUGINS_MSDL "Build MSDL module (requires Qt6 XmlPatterns)" OFF)
 OPTION(BUILD_PLUGINS_SAAB "Build Saab module (requires Qt6 XmlPatterns)" OFF)
 OPTION(BUILD_RTI "Build RTI Connext DDS dependent modules" OFF)
+OPTION(BUILD_VIEWER_ONLY "Build only Viewer module (no RTI required)" OFF)
 # Add Lts/ include path globally for QosProfile and other Lts headers
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Lts)
 IF(BUILD_RTI)
  # Define BUILD_RTI as preprocessor macro for all targets
  ADD_COMPILE_DEFINITIONS(BUILD_RTI)
+  # External (RTI) DDS is available: compile the BUILD_WITH_EXTERNAL_DDS code paths
+  # (used by 73 guards across plugins, e.g. MrkCommon's MarkerManagementDialogModel /
+  # CustomViewMarker). Legacy always compiled this DDS code; the flag is a migration
+  # option that was never wired into CMake, so its absence silently dropped the
+  # definitions while the unguarded class declarations still referenced them (link error).
+  ADD_COMPILE_DEFINITIONS(BUILD_WITH_EXTERNAL_DDS)
 ENDIF()
 OPTION(BUILD_ARCGIS "Build ArcGIS SDK dependent modules" ON)
 OPTION(BUILD_FILTERMANAGEMENT "Build FilterManagement plugins (temporarily disabled for migration)" OFF)
@@ -225,15 +263,28 @@ IF(WIN32)
 ELSE()
  # Linux: ArcGIS SDK Pfad konfigurieren (nur wenn BUILD_ARCGIS=ON)
  IF(BUILD_ARCGIS)
-    # Use environment variable ARCGIS_ROOT if set, otherwise default to /repo/external/...
+    # Use environment variable ARCGIS_ROOT if set, otherwise check relative to source dir, then Docker/host paths
    IF(DEFINED ENV{ARCGIS_ROOT})
      SET(ARCGIS_SDK_DIR "$ENV{ARCGIS_ROOT}" CACHE STRING "ArcGIS Runtime SDK for Qt directory")
-    ELSE()
+    ELSEIF(EXISTS "${CMAKE_SOURCE_DIR}/external/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk")
+      SET(ARCGIS_SDK_DIR "${CMAKE_SOURCE_DIR}/external/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk" CACHE STRING "ArcGIS Runtime SDK for Qt directory")
+    ELSEIF(DEFINED ENV{DOCKER_MOUNT_ROOT})
+      SET(ARCGIS_SDK_DIR "$ENV{DOCKER_MOUNT_ROOT}/external/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk" CACHE STRING "ArcGIS Runtime SDK for Qt directory")
+    ELSEIF(EXISTS "/repo/external/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk")
      SET(ARCGIS_SDK_DIR "/repo/external/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk" CACHE STRING "ArcGIS Runtime SDK for Qt directory")
+    ELSEIF(EXISTS "/workspace/external/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk")
+      SET(ARCGIS_SDK_DIR "/workspace/external/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk" CACHE STRING "ArcGIS Runtime SDK for Qt directory")
+    ELSE()
+      SET(ARCGIS_SDK_DIR "" CACHE STRING "ArcGIS Runtime SDK for Qt directory")
    ENDIF()
    IF(EXISTS "${ARCGIS_SDK_DIR}")
      LIST(APPEND CMAKE_PREFIX_PATH "${ARCGIS_SDK_DIR}")
      MESSAGE(STATUS "ArcGIS SDK found at: ${ARCGIS_SDK_DIR}")
+      # arcgisversion.h (a custom RME file in the SDK include dir) is pulled in via
+      # <SituationMap/Map/layer_factory.h> by many non-ArcGIS plugin targets (e.g.
+      # IsmResGuiPlugin); the ArcGIS::ArcGIS target include dir does not reach them, so
+      # expose the SDK include dir tree-wide when the SDK is present.
+      include_directories(${ARCGIS_SDK_DIR}/include)
    ELSE()
      MESSAGE(WARNING "ArcGIS SDK not found at: ${ARCGIS_SDK_DIR}")
    ENDIF()
@@ -244,12 +295,6 @@ ENDIF()
 SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 INCLUDE(FindLibraryWithDebug)

-# Find ArcGIS SDK globally if BUILD_ARCGIS is enabled
-# This creates ArcGIS::ArcGIS target for all modules to use
-IF(BUILD_ARCGIS)
-  FIND_PACKAGE(ArcGIS REQUIRED)
-ENDIF()
-
 ENABLE_TESTING()
 INCLUDE(CTest)
 CONFIGURE_FILE(CTestCustom.ctest ${CMAKE_BINARY_DIR}/CTestCustom.ctest COPYONLY)
@@ -299,7 +344,7 @@ endif()
 # server uses QWebSocketServer; LtsWebSocket/httq enable their real websocket
 # paths via QT6_WEBSOCKETS_AVAILABLE when the module is found).
 find_package(Qt6 6.2 COMPONENTS Concurrent Core LinguistTools Network
-  Multimedia Sql SerialPort Test Xml Positioning Svg WebSockets QUIET)
+  Multimedia Sql SerialPort Test Xml Positioning Svg WebSockets PrintSupport OpenGL OpenGLWidgets QUIET)

 if(Qt6_FOUND)
  # Skip GUI find_package - it fails without OpenGL. We'll create manual targets below.
@@ -309,7 +354,7 @@ endif()

 # If Qt6 not found yet, try with full component list including OpenGL
 if(NOT Qt6_FOUND)
-  find_package(Qt6 6.2 COMPONENTS Concurrent Core LinguistTools Network OpenGL PrintSupport
+  find_package(Qt6 6.2 COMPONENTS Concurrent Core LinguistTools Network OpenGL OpenGLWidgets PrintSupport
    Multimedia Sql Svg SerialPort Test UiTools WebSockets WebEngineCore WebEngineWidgets
    Widgets Xml Positioning QUIET)
  if(Qt6_FOUND AND OpenGL_FOUND)
@@ -329,9 +374,40 @@ if(NOT TARGET Qt6::Core)
  find_package(Qt6 6.2 COMPONENTS Core REQUIRED)
 endif()

+# Qt State Machine (QState/QStateMachine) was moved out of QtGui in Qt6 into the
+# separate "Qt State Machine" add-on (the qtscxml package). In Qt5 the state
+# machine classes lived inside QtGui/QtCore, so the ExerciseManagement state
+# machines (exercise_state_base/exercise_state_machine) compiled without an
+# explicit StateMachine dependency. Probe for the module now; if present the
+# affected targets link Qt6::StateMachine (guarded per-target below).
+find_package(Qt6 6.2 COMPONENTS StateMachine QUIET)
+
 # Create imported targets for all available Qt6 libraries
+# Use Qt6 installation path from find_package or fall back to system paths
+if(Qt6Core_DIR)
+  # <Qt6Core_DIR> is the cmake package dir: <prefix>/lib/cmake/Qt6Core in the
+  # standard Qt layout and <prefix>/<multiarch>/cmake/Qt6Core in the Debian/
+  # Ubuntu layout — so the library dir is two levels up in both. (Going three
+  # levels up and appending /lib only matches the standard layout; in the
+  # Debian validation container it resolved to /usr/lib/lib and every manual
+  # target below was silently skipped, breaking all targets linking
+  # Qt6::Sql / Qt6::Xml / Qt6::Test.)
+  get_filename_component(QT6_LIB_DIR "${Qt6Core_DIR}/../.." ABSOLUTE)
+  get_filename_component(QT6_ARCH_DIR "${QT6_LIB_DIR}" NAME)
+  # The standard layout keeps headers in <prefix>/include; Debian/Ubuntu keeps
+  # them in <prefix>/include/<multiarch>/qt6 — probe the multiarch form first.
+  if(EXISTS "${QT6_LIB_DIR}/../../include/${QT6_ARCH_DIR}/qt6")
+    get_filename_component(QT6_INC_DIR "${QT6_LIB_DIR}/../../include/${QT6_ARCH_DIR}/qt6" ABSOLUTE)
+  else()
+    get_filename_component(QT6_INC_DIR "${QT6_LIB_DIR}/../include" ABSOLUTE)
+  endif()
+elseif(DEFINED ENV{QT_BASE_DIR} AND DEFINED ENV{QT_VERSION} AND DEFINED ENV{QT_ARCH_DIR})
+  set(QT6_LIB_DIR "$ENV{QT_BASE_DIR}/$ENV{QT_VERSION}/$ENV{QT_ARCH_DIR}/lib")
+  set(QT6_INC_DIR "$ENV{QT_BASE_DIR}/$ENV{QT_VERSION}/$ENV{QT_ARCH_DIR}/include")
+else()
  set(QT6_LIB_DIR "/usr/lib/x86_64-linux-gnu")
  set(QT6_INC_DIR "/usr/include/x86_64-linux-gnu/qt6")
+endif()

 # Qt6::DBus
 if(NOT TARGET Qt6::DBus AND EXISTS "${QT6_LIB_DIR}/libQt6DBus.so.6")
@@ -376,6 +452,30 @@ if(EXISTS "${QT6_LIB_DIR}/libQt6Widgets.so.6")
  message(STATUS "Manually configured Qt6 Widgets target")
 endif()

+# Qt6::OpenGL - create manual target if not found (QOpenGLPaintDevice, used by ArcGIS SDK)
+if(NOT TARGET Qt6::OpenGL AND EXISTS "${QT6_LIB_DIR}/libQt6OpenGL.so.6")
+  add_library(Qt6::OpenGL SHARED IMPORTED)
+  set_target_properties(Qt6::OpenGL PROPERTIES
+    IMPORTED_LOCATION "${QT6_LIB_DIR}/libQt6OpenGL.so.6"
+    INTERFACE_INCLUDE_DIRECTORIES "${QT6_INC_DIR}/QtGui;${QT6_INC_DIR}"
+    INTERFACE_LINK_LIBRARIES "Qt6::Core"
+  )
+  message(STATUS "Manually configured Qt6 OpenGL target")
+endif()
+
+# Qt6::OpenGLWidgets - create manual target if not found
+# (QOpenGLWidget, used by the ArcGIS SDK MapGraphicsView/SceneGraphicsView objects;
+#  Qt6 splits QOpenGLWidget into its own libQt6OpenGLWidgets.so)
+if(NOT TARGET Qt6::OpenGLWidgets AND EXISTS "${QT6_LIB_DIR}/libQt6OpenGLWidgets.so.6")
+  add_library(Qt6::OpenGLWidgets SHARED IMPORTED)
+  set_target_properties(Qt6::OpenGLWidgets PROPERTIES
+    IMPORTED_LOCATION "${QT6_LIB_DIR}/libQt6OpenGLWidgets.so.6"
+    INTERFACE_INCLUDE_DIRECTORIES "${QT6_INC_DIR}/QtWidgets;${QT6_INC_DIR}"
+    INTERFACE_LINK_LIBRARIES "Qt6::Core;Qt6::Gui;Qt6::Widgets"
+  )
+  message(STATUS "Manually configured Qt6 OpenGLWidgets target")
+endif()
+
 # Qt6::Sql - create manual target if not found
 if(NOT TARGET Qt6::Sql AND EXISTS "${QT6_LIB_DIR}/libQt6Sql.so.6")
  add_library(Qt6::Sql SHARED IMPORTED)
@@ -420,7 +520,16 @@ if(NOT TARGET Qt6::Test AND EXISTS "${QT6_LIB_DIR}/libQt6Test.so.6")
  message(STATUS "Manually configured Qt6 Test target")
 endif()

-# Qt6::Svg target should be found by find_package above
+# Qt6::Multimedia - create manual target if not found
+if(NOT TARGET Qt6::Multimedia AND EXISTS "${QT6_LIB_DIR}/libQt6Multimedia.so.6")
+  add_library(Qt6::Multimedia SHARED IMPORTED)
+  set_target_properties(Qt6::Multimedia PROPERTIES
+    IMPORTED_LOCATION "${QT6_LIB_DIR}/libQt6Multimedia.so.6"
+    INTERFACE_INCLUDE_DIRECTORIES "${QT6_INC_DIR}/QtMultimedia;${QT6_INC_DIR}"
+    INTERFACE_LINK_LIBRARIES "Qt6::Core;Qt6::Gui"
+  )
+  message(STATUS "Manually configured Qt6 Multimedia target")
+endif()

 # Stub Qt6::Multimedia target if not available (needed by OscSystemGuiPlugin, etc.)
 if(NOT TARGET Qt6::Multimedia)
@@ -431,6 +540,21 @@ if(NOT TARGET Qt6::Multimedia)
  message(STATUS "Created stub target for Qt6::Multimedia (library not available)")
 endif()

+# Qt6::Svg - create manual target if not found. Also require the headers:
+# the container can ship the runtime library (libqt6svg6 via Recommends)
+# without qt6-svg-dev, and an imported target with a non-existent
+# INTERFACE_INCLUDE_DIRECTORIES entry fails the CMake generate step for
+# every Svg consumer. Without headers the stub below is used instead.
+if(NOT TARGET Qt6::Svg AND EXISTS "${QT6_LIB_DIR}/libQt6Svg.so.6" AND EXISTS "${QT6_INC_DIR}/QtSvg")
+  add_library(Qt6::Svg SHARED IMPORTED)
+  set_target_properties(Qt6::Svg PROPERTIES
+    IMPORTED_LOCATION "${QT6_LIB_DIR}/libQt6Svg.so.6"
+    INTERFACE_INCLUDE_DIRECTORIES "${QT6_INC_DIR}/QtSvg;${QT6_INC_DIR}"
+    INTERFACE_LINK_LIBRARIES "Qt6::Core;Qt6::Gui"
+  )
+  message(STATUS "Manually configured Qt6 Svg target")
+endif()
+
 # Stub Qt6::Svg target if not available (needed by various plugins)
 if(NOT TARGET Qt6::Svg)
  add_library(Qt6::Svg INTERFACE IMPORTED)
@@ -457,6 +581,30 @@ if(NOT TARGET Qt6::SerialPort)
  message(STATUS "Created stub target for Qt6::SerialPort (library not available)")
 endif()

+# Qt6::WebEngineCore - real imported target if the library exists (stub below otherwise).
+# The stub carries no library, so targets linking it (e.g. SmoSystemMonitorGuiPlugin)
+# fail --no-undefined on QWebEngine* symbols.
+if(NOT TARGET Qt6::WebEngineCore AND EXISTS "${QT6_LIB_DIR}/libQt6WebEngineCore.so.6")
+  add_library(Qt6::WebEngineCore SHARED IMPORTED)
+  set_target_properties(Qt6::WebEngineCore PROPERTIES
+    IMPORTED_LOCATION "${QT6_LIB_DIR}/libQt6WebEngineCore.so.6"
+    INTERFACE_INCLUDE_DIRECTORIES "${QT6_INC_DIR}/QtWebEngineCore;${QT6_INC_DIR}"
+    INTERFACE_LINK_LIBRARIES "Qt6::Core;Qt6::Gui"
+  )
+  message(STATUS "Manually configured Qt6 WebEngineCore target")
+endif()
+
+# Qt6::WebEngineWidgets - real imported target if the library exists.
+if(NOT TARGET Qt6::WebEngineWidgets AND EXISTS "${QT6_LIB_DIR}/libQt6WebEngineWidgets.so.6")
+  add_library(Qt6::WebEngineWidgets SHARED IMPORTED)
+  set_target_properties(Qt6::WebEngineWidgets PROPERTIES
+    IMPORTED_LOCATION "${QT6_LIB_DIR}/libQt6WebEngineWidgets.so.6"
+    INTERFACE_INCLUDE_DIRECTORIES "${QT6_INC_DIR}/QtWebEngineWidgets;${QT6_INC_DIR}"
+    INTERFACE_LINK_LIBRARIES "Qt6::Core;Qt6::Gui;Qt6::Widgets;Qt6::WebEngineCore"
+  )
+  message(STATUS "Manually configured Qt6 WebEngineWidgets target")
+endif()
+
 # Stub Qt6::WebEngineCore target if not available (needed by thp_viewer)
 if(NOT TARGET Qt6::WebEngineCore)
  add_library(Qt6::WebEngineCore INTERFACE IMPORTED)
@@ -476,8 +624,10 @@ if(NOT TARGET Qt6::WebEngineWidgets)
 endif()

 # Stub KDReports::KDReports target if not available (needed by LtsReportDisplay)
+# UNKNOWN (not INTERFACE) so FindKDReports.cmake can upgrade it with a real
+# IMPORTED_LOCATION; an INTERFACE imported target ignores IMPORTED_LOCATION.
 if(NOT TARGET KDReports::KDReports)
-  add_library(KDReports::KDReports INTERFACE IMPORTED)
+  add_library(KDReports::KDReports UNKNOWN IMPORTED)
  set_target_properties(KDReports::KDReports PROPERTIES
    INTERFACE_COMPILE_DEFINITIONS "NO_KDREPORTS"
  )
@@ -493,24 +643,6 @@ if(NOT TARGET Qt6::Core5Compat)
  message(STATUS "Created stub target for Qt6::Core5Compat (library not available)")
 endif()

-# Stub Qt6::PrintSupport target if not available (needed by textEditorTest, thp_viewer)
-if(NOT TARGET Qt6::PrintSupport)
-  add_library(Qt6::PrintSupport INTERFACE IMPORTED)
-  set_target_properties(Qt6::PrintSupport PROPERTIES
-    INTERFACE_COMPILE_DEFINITIONS "QT_NO_PRINTSUPPORT"
-  )
-  message(STATUS "Created stub target for Qt6::PrintSupport (library not available)")
-endif()
-
-# Stub Qt6::OpenGL target if not available (needed by PwsGuiPlugin)
-if(NOT TARGET Qt6::OpenGL)
-  add_library(Qt6::OpenGL INTERFACE IMPORTED)
-  set_target_properties(Qt6::OpenGL PROPERTIES
-    INTERFACE_COMPILE_DEFINITIONS "QT_NO_OPENGL"
-  )
-  message(STATUS "Created stub target for Qt6::OpenGL (library not available)")
-endif()
-
 # Qt6::WebSockets - create manual target if not found (the container's Qt6
 # discovery takes the minimal path, so find_package never creates the
 # component targets). The migrated FileManagement service (THP script
@@ -535,6 +667,46 @@ if(NOT TARGET Qt6::WebSockets)
  message(STATUS "Created stub target for Qt6::WebSockets (library not available)")
 endif()

+# Qt6::PrintSupport - create manual target if not found
+if(NOT TARGET Qt6::PrintSupport AND EXISTS "${QT6_LIB_DIR}/libQt6PrintSupport.so.6")
+  add_library(Qt6::PrintSupport SHARED IMPORTED)
+  set_target_properties(Qt6::PrintSupport PROPERTIES
+    IMPORTED_LOCATION "${QT6_LIB_DIR}/libQt6PrintSupport.so.6"
+    INTERFACE_INCLUDE_DIRECTORIES "${QT6_INC_DIR}/QtPrintSupport;${QT6_INC_DIR}"
+    INTERFACE_LINK_LIBRARIES "Qt6::Core;Qt6::Gui;Qt6::Widgets"
+  )
+  message(STATUS "Manually configured Qt6 PrintSupport target")
+endif()
+
+# Stub Qt6::PrintSupport target if not available (needed by textEditorTest, thp_viewer)
+if(NOT TARGET Qt6::PrintSupport)
+  add_library(Qt6::PrintSupport INTERFACE IMPORTED)
+  set_target_properties(Qt6::PrintSupport PROPERTIES
+    INTERFACE_COMPILE_DEFINITIONS "QT_NO_PRINTSUPPORT"
+  )
+  message(STATUS "Created stub target for Qt6::PrintSupport (library not available)")
+endif()
+
+# Qt6::OpenGL - create manual target if not found
+if(NOT TARGET Qt6::OpenGL AND EXISTS "${QT6_LIB_DIR}/libQt6OpenGL.so.6")
+  add_library(Qt6::OpenGL SHARED IMPORTED)
+  set_target_properties(Qt6::OpenGL PROPERTIES
+    IMPORTED_LOCATION "${QT6_LIB_DIR}/libQt6OpenGL.so.6"
+    INTERFACE_INCLUDE_DIRECTORIES "${QT6_INC_DIR}/QtOpenGL;${QT6_INC_DIR}"
+    INTERFACE_LINK_LIBRARIES "Qt6::Core;Qt6::Gui"
+  )
+  message(STATUS "Manually configured Qt6 OpenGL target")
+endif()
+
+# Stub Qt6::OpenGL target if not available (needed by PwsGuiPlugin)
+if(NOT TARGET Qt6::OpenGL)
+  add_library(Qt6::OpenGL INTERFACE IMPORTED)
+  set_target_properties(Qt6::OpenGL PROPERTIES
+    INTERFACE_COMPILE_DEFINITIONS "QT_NO_OPENGL"
+  )
+  message(STATUS "Created stub target for Qt6::OpenGL (library not available)")
+endif()
+
 # Set variable for legacy code that uses ${Qt6_WebSockets} — subdirectory
 # CMakeLists contain `set(Qt6_WebSockets ${Qt6_WebSockets})` optional-guard
 # no-ops that keep this root-scope value.
@@ -552,6 +724,12 @@ endif()

 MESSAGE(STATUS "Qt version is ${Qt6Core_VERSION}, GUI available: ${QT6_GUI_AVAILABLE}")

+# Find ArcGIS SDK after Qt6 is configured
+# This creates ArcGIS::ArcGIS target for all modules to use
+IF(BUILD_ARCGIS)
+  FIND_PACKAGE(ArcGIS REQUIRED)
+ENDIF()
+
 #
 # RTI Connext DDS - manuelle Konfiguration da keine CMake Config Files vorhanden
 #
@@ -559,10 +737,15 @@ IF(BUILD_RTI)
  # Support environment variable override, otherwise use relative path from repo root
  IF(DEFINED ENV{DDS_PATH})
    SET(RTI_INSTALL_DIR "$ENV{DDS_PATH}" CACHE PATH "RTI Connext DDS installation directory")
+  ELSEIF(DEFINED ENV{DOCKER_MOUNT_ROOT})
+    # Use DOCKER_MOUNT_ROOT environment variable if set (supports both /repo and /workspace)
+    SET(RTI_INSTALL_DIR "$ENV{DOCKER_MOUNT_ROOT}/external/rti_connext_dds-7.7.0" CACHE PATH "RTI Connext DDS installation directory")
  ELSE()
-    # In Docker container: /workspace/external/rti_connext_dds-7.7.0
+    # In Docker container: /repo/external/rti_connext_dds-7.7.0 (current) or /workspace/external/rti_connext_dds-7.7.0 (old)
    # On host: ${CMAKE_SOURCE_DIR}/../../../external/rti_connext_dds-7.7.0
-    IF(EXISTS "/workspace/external/rti_connext_dds-7.7.0")
+    IF(EXISTS "/repo/external/rti_connext_dds-7.7.0")
+      SET(RTI_INSTALL_DIR "/repo/external/rti_connext_dds-7.7.0" CACHE PATH "RTI Connext DDS installation directory")
+    ELSEIF(EXISTS "/workspace/external/rti_connext_dds-7.7.0")
      SET(RTI_INSTALL_DIR "/workspace/external/rti_connext_dds-7.7.0" CACHE PATH "RTI Connext DDS installation directory")
    ELSEIF(EXISTS "${CMAKE_SOURCE_DIR}/../../../external/rti_connext_dds-7.7.0")
      SET(RTI_INSTALL_DIR "${CMAKE_SOURCE_DIR}/../../../external/rti_connext_dds-7.7.0" CACHE PATH "RTI Connext DDS installation directory")
@@ -607,6 +790,36 @@ IF(BUILD_RTI)
    # the AutogenInfo MOC_INCLUDES.
    SET(CMAKE_AUTOMOC_INCLUDE_DIRECTORIES ${CMAKE_AUTOMOC_INCLUDE_DIRECTORIES} ${CMAKE_SOURCE_DIR}/include/Viewer/SituationMap/ElevationMap)

+    # The migrated Projects declare Q_INTERFACES(ProjectPlugin::Plugin) and include
+    # <PluginInterfaces/project_plugin_interface.h>. That include dir
+    # (Lts/Common/PluginInterfaces/..) is only a target-level PUBLIC include of
+    # ProjectPluginInterface and is NOT part of the global include_directories that
+    # reach the AutogenInfo MOC_INCLUDES, so moc fails with "Undefined interface".
+    # Add the Lts/Common root explicitly (mirrors the Lts append above) so moc can
+    # resolve the interface. Must be set at root scope - subdir appends do not
+    # reach the AutogenInfo MOC_INCLUDES.
+    SET(CMAKE_AUTOMOC_INCLUDE_DIRECTORIES ${CMAKE_AUTOMOC_INCLUDE_DIRECTORIES} ${CMAKE_SOURCE_DIR}/Lts/Common)
+
+    # The TrainingAreaBase tab plugins (tabPluginHla / tabPluginWlsTetra /
+    # tabPluginDebugJsonDir / ...) declare Q_INTERFACES(TrainingAreaBase::Plugin::Plugin)
+    # and include <TrainingAreaBase/tab_plugin_interface.h>. That include dir
+    # (Lts/Proxies) is only a target-level INTERFACE include of tabPluginInterface and
+    # is NOT part of the global include_directories that reach the AutogenInfo
+    # MOC_INCLUDES, so moc fails with "Undefined interface". Add the Lts/Proxies root
+    # explicitly so moc can resolve the interface. Must be set at root scope - subdir
+    # appends do not reach the AutogenInfo MOC_INCLUDES.
+    SET(CMAKE_AUTOMOC_INCLUDE_DIRECTORIES ${CMAKE_AUTOMOC_INCLUDE_DIRECTORIES} ${CMAKE_SOURCE_DIR}/Lts/Proxies)
+
+    # Designer plugins (ltswidgetsplugin) declare Q_INTERFACES(QDesignerCustomWidgetInterface)
+    # and include <QtUiPlugin/QDesignerCustomWidgetInterface>. That interface's
+    # Q_DECLARE_INTERFACE lives in the Qt6 QtUiPlugin module, which moc cannot resolve
+    # without the Qt6 parent include dir (it is only a target-level INTERFACE include of
+    # Qt6::UiTools and does not reach the global AutogenInfo MOC_INCLUDES). Add Qt6::Core's
+    # interface include dirs (which expose the <QtModule>/header root) so moc finds the
+    # interface. Must be set at root scope.
+    get_target_property(_qt6_autmoc_incs Qt6::Core INTERFACE_INCLUDE_DIRECTORIES)
+    SET(CMAKE_AUTOMOC_INCLUDE_DIRECTORIES ${CMAKE_AUTOMOC_INCLUDE_DIRECTORIES} ${_qt6_autmoc_incs})
+
    # IMPORTED Targets für RTI Libraries erstellen
    # Debug und Release Varianten korrekt konfigurieren
    FOREACH(lib nddsc nddscore nddscpp nddscpp2 nddsctesthelpers)
@@ -1,294 +0,0 @@
-# CTest Integration Status - Qt6 Migration
-
-**Project:** qt-migration-legatus  
-**Branch:** showcase/unittest-and-validate-step-integration-in-lts-svc-s  
-**Last Updated:** 2026-09-17  
-**Build Configuration:** BUILD_RTI=ON, Qt6, GCC 15
-
---
-
-## Executive Summary
-
-✅ **92% Test Success Rate** (427/463 tests passing)  
-✅ **All 7 Success Criteria Met**  
-✅ **BUILD_RTI=ON Compilation Working**  
-✅ **CTest Integration Complete**
-
---
-
-## Success Criteria Verification
-
-| # | Criterion | Status | Notes |
-|---|-----------|--------|-------|
-| 1 | Qt6 build succeeds | ✅ PASS | No Qt5 targets linked |
-| 2 | CTest runs successfully | ✅ PASS | 92% pass rate (427/463) |
-| 3 | Tests registered with CTest | ✅ PASS | 463 tests discovered |
-| 4 | BUILD_RTI=ON compilation | ✅ PASS | Generated headers + stubs working |
-| 5 | No Qt5 targets linked | ✅ PASS | All targets use Qt6 |
-| 6 | Generated outputs in build tree | ✅ PASS | `${CMAKE_BINARY_DIR}/Lts/Services/` |
-| 7 | All 7 LTS services present | ✅ PASS | See Services section below |
-
---
-
-## Build Configuration
-
-### CMake Options
-```bash
-cmake -G "Unix Makefiles" \
-  -DCMAKE_BUILD_TYPE=Release \
-  -DBUILD_RTI=ON \
-  -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-  ..
-```
-
-### Environment
- **Qt Version:** Qt6 (all targets)
- **Compiler:** GCC 15
- **Test Framework:** Google Test (gtest_discover_tests)
- **Headless Testing:** QT_QPA_PLATFORM=offscreen
-
---
-
-## Test Results Summary
-
-### Overall Statistics
-```
-Total Tests:    463
-Passed:         427 (92%)
-Failed:           9 (2%)
-Not Run:         27 (6%)
-```
-
-### Test Executables Status
-
-| Executable | Tests | Status | Notes |
-|------------|-------|--------|-------|
-| migration_tests | 362 | ✅ Running | Google Test, all passing |
-| test_qt6_api_migrations | 12 | ⚠️ 1 Failed | QStringView pointer comparison |
-| test_qt6_compatibility | 12 | ✅ Passing | Qt6 API compatibility |
-| test_item | 12 | ✅ Passing | LtsTimelineClassic excluded |
-| test_passiveeventcontainer | 12 | ✅ Passing | LtsTimelineClassic excluded |
-| test_eventdelegate | 12 | ✅ Passing | LtsTimelineClassic excluded |
-| BuildRTIGuards | 4 | ⚠️ 2 Failed | RTI detection logic |
-| ExportHeaders | 4 | ⚠️ 4 Failed | Export header paths |
-| CppTopicGeneratorGrantleeTest | 2 | ⚠️ 2 Failed | Grantlee template loading |
-| ddsGenericDataTests | 9 | ❌ Not Run | DDS executable not built |
-| ddsDataTopicTests | 9 | ❌ Not Run | DDS executable not built |
-| ddsFunctionTopicTests | 9 | ❌ Not Run | DDS executable not built |
-| aes_*_tests | 18 | ❌ Not Run | AES executables not built |
-| GrantleeParserSmoke | 1 | ❌ Not Run | Stub test infrastructure |
-
---
-
-## Known Issues (Non-Critical)
-
-### 0. Buildings Include Directory Warning
-**Issue:** `cc1plus: warning: .../build4/Lts/Services/Buildings: No such file or directory`  
-**Location:** CMake cache (legacy include path)  
-**Impact:** Cosmetic warning only, no build impact  
-**Status:** Harmless warning, does not affect build or tests
-
-### 1. Qt6ApiMigrations.QStringViewBasic Failure
-**Issue:** Pointer comparison with QStringView not guaranteed  
-**Location:** `tests/test_qt6_api_migrations.cpp`  
-**Impact:** Test infrastructure issue, not migration bug  
-**Status:** Accepted limitation
-
-### 2. BuildRTIGuards Failures (2 tests)
-**Issue:** Test expects RTI unavailable, but BUILD_RTI=ON  
-**Location:** `tests/test_build_rti_guards.cpp`  
-**Impact:** Test logic mismatch with build configuration  
-**Status:** Expected behavior with BUILD_RTI=ON
-
-### 3. ExportHeaders Failures (4 tests)
-**Issue:** Tests search for export headers in incorrect paths  
-**Location:** `tests/test_export_headers.cpp`  
-**Impact:** Test path configuration, not actual missing headers  
-**Status:** Test infrastructure issue
-
-### 4. CppTopicGeneratorGrantleeTest Failures (2 tests)
-**Issue:** Grantlee template loading errors  
-**Location:** `tests/test_cpp_topic_generator_grantlee.cpp`  
-**Impact:** Grantlee integration test infrastructure  
-**Status:** Test infrastructure issue
-
-### 5. DDS Tests Not Run (27 tests)
-**Issue:** DDS test executables not built in current configuration  
-**Location:** `tests/dds/` directory  
-**Impact:** DDS tests excluded from migration_tests target  
-**Status:** Expected - DDS requires separate build configuration
-
---
-
-## Resolved Issues
-
-### BUILD_RTI=ON Header Generation ✅
-
-#### pdm_types.h
- **Location:** `build4/Lts/Services/ProjectDataManagement/pdm_types.h`
- **Include Path:** `${CMAKE_BINARY_DIR}/Lts/Services`
- **Status:** Generated and found correctly
-
-#### aes_enums.hpp
- **Location:** `include/AreaEffectSimulation/aes_enums.hpp.stub`
- **Type:** Stub file (IDL generation not available)
- **Enums:** `SymbolAppearance`, `SymbolVisibility`
- **Status:** Created and integrated
-
-#### flm_enums.hpp
- **Location:** `include/FileManagement/flm_enums.hpp.stub`
- **Type:** Stub file (used when BUILD_RTI=ON)
- **Status:** Present and used correctly
-
-#### Codegen Pattern
- FileManagement CMakeLists.txt fixed: CONFIGURE_FILE for stub only when BUILD_RTI=OFF
- Include directory order fixed: NGL_TARGET_INCLUDE_DIRECTORIES before CODEGEN_IDL_SVC
- Matches ProjectDataManagement pattern for consistent header generation
-
-#### Other Enum Stubs
- ✅ `ppm_enums.hpp.stub` (ParticipantManagement)
- ✅ `ism_enums.hpp.stub` (InfrastructureManagement)
- ✅ `exm_enums.hpp.stub` (ExerciseManagement)
- ✅ `flm_enums.hpp.stub` (FileManagement)
- ✅ `aes_enums.hpp.stub` (AreaEffectSimulation)
-
-### Include Path Fixes ✅
- Added `${CMAKE_BINARY_DIR}/Lts/Services` to include directories
- Fixed export header includes to use parent directory pattern
- Added NGLLogger and IsmShared include paths
- Fixed TrainingAreaBaseOC include directory
- Fixed LtsTimelineClassic include path: `${CMAKE_BINARY_DIR}` → `${CMAKE_SOURCE_DIR}`
- Removed non-existent Buildings include directory from root CMakeLists.txt
-
-### Qt6 API Compatibility ✅
- Fixed `QString("...")` → `QStringLiteral("...")` in all test files
- Fixed `QChar('A')` → `QChar(u'A')` for Qt6
- Fixed `QString::count()`, `QString::values()`, `QString::contains()` with string literals
- Fixed `QStringList{"test"}` → `QStringList{QStringLiteral("test")}`
-
-### Test Framework Conflict ✅
- **Issue:** migration_tests linked both Qt Test and Google Test
- **Fix:** Removed `Qt6::Test` from `target_link_libraries`
- **Excluded:** `test_lts_app_descriptor.cpp` (uses QTEST_MAIN)
-
-### LtsTimelineClassic Exclusions ✅
-**13 test files excluded** when LtsTimelineClassic target not available:
- test_event.cpp, test_eventdelegate.cpp, test_eventgraphic.cpp
- test_eventlist.cpp, test_eventtools.cpp, test_item.cpp
- test_passiveeventcontainer.cpp, test_testtimelinemodel.cpp
- test_timelineheaderview.cpp, test_timelinemodel.cpp
- test_timelinewidget.cpp, test_abstracttimelinemodel.cpp
- test_lts_app_descriptor.cpp (Qt Test conflict)
-
-### Headless Testing ✅
- Added `QT_QPA_PLATFORM=offscreen` to `docker_build.sh`
- Resolves "no Qt platform plugin could be initialized" error
-
---
-
-## LTS Services Status
-
-All 7 required services are present and building:
-
-| # | Service | CMakeLists.txt | Status |
-|---|---------|----------------|--------|
-| 1 | AlarmManagement | `Lts/Services/AlarmManagement/CMakeLists.txt` | ✅ |
-| 2 | AreaEffectSimulation | `Lts/Services/AreaEffectSimulation/CMakeLists.txt` | ✅ |
-| 3 | ExerciseManagement | `Lts/Services/ExerciseManagement/CMakeLists.txt` | ✅ |
-| 4 | FileManagement | `Lts/Services/FileManagement/CMakeLists.txt` | ✅ |
-| 5 | InfrastructureManagement | `Lts/Services/InfrastructureManagement/CMakeLists.txt` | ✅ |
-| 6 | ParticipantManagement | `Lts/Services/ParticipantManagement/CMakeLists.txt` | ✅ |
-| 7 | ProjectDataManagement | `Lts/Services/ProjectDataManagement/CMakeLists.txt` | ✅ |
-
---
-
-## File Changes Summary
-
-### CMake Configuration
- `CMakeLists.txt` - Added `include(CTest)`, fixed include directories, added all service paths
- `tests/CMakeLists.txt` - Test configuration, gtest_discover_tests, exclusions
- All service `CMakeLists.txt` files - Added `CONFIGURE_FILE` commands for enum stubs
-
-### Test Files Fixed
- `tests/test_item.cpp` - Qt6 QString fixes
- `tests/test_lts_app_descriptor.cpp` - QString assignment fix
- `tests/test_ltswidgets_qt6.cpp` - Multiple QString fixes
- `tests/test_migration_stubs.cpp` - Namespace fixes, duplicate include removed
- `tests/test_passiveeventcontainer.cpp` - QString literal fixes
- `tests/test_qt6_api_migrations.cpp` - QStringLiteral throughout
- `tests/test_qt6_compatibility.cpp` - QChar and QString fixes
- `tests/test_symbology_xml.cpp` - Multiple QString/method call fixes
- `tests/test_testtimelinemodel.cpp` - QStringList fixes
- `tests/test_taboc_dtc.cpp` - Include path fix
- `tests/test_pdm_dtc.cpp` - Include path fix
- 14× `tests/test_*_enums.cpp` - Include path fixes
-
-### Stub Files Created
- `include/ParticipantManagement/ppm_enums.hpp.stub`
- `include/InfrastructureManagement/ism_enums.hpp.stub`
- `include/ExerciseManagement/exm_enums.hpp.stub`
- `include/FileManagement/flm_enums.hpp.stub`
- `include/AreaEffectSimulation/aes_enums.hpp.stub`
- `Lts/Common/CodeGen/GrantleeParserSmoke.h` (stub header)
- `Lts/Common/LtsTimelineClassic/ltstimelineclassic_export.h` (stub export header)
-
-### Build Configuration
- `docker_build.sh` - Added `QT_QPA_PLATFORM=offscreen` for headless testing
-
---
-
-## CTest Integration
-
-### Configuration
-```cmake
-# Main CMakeLists.txt
-include(CTest)
-enable_testing()
-
-# tests/CMakeLists.txt
-gtest_discover_tests(migration_tests)
-```
-
-### Execution
-```bash
-cd build4 && ctest --output-on-failure
-```
-
-### Path Configuration
- **Working Directory:** `/home/torsten/sandbox/qt6-migration-pipeline`
- **Docker Container Path:** `/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus`
- **Test Executables:** `build4/bin/<Configuration>/`
-
---
-
-## Recommendations
-
-### For Production Migration
-1. ✅ Current state is **production-ready** for Qt6 migration
-2. ✅ 92% test pass rate exceeds typical CI/CD thresholds
-3. ✅ All critical success criteria met
-4. ℹ️ Remaining failures are test infrastructure issues, not migration bugs
-
-### Optional Improvements
-1. Fix ExportHeaders test paths (low priority)
-2. Update BuildRTIGuards test logic (low priority)
-3. Investigate Grantlee template loading (medium priority)
-4. Build DDS test executables separately (optional)
-
---
-
-## Conclusion
-
-The Qt6 migration for LTS Services is **complete and successful**. All 7 success criteria are met, BUILD_RTI=ON compilation works correctly with generated headers and stub files, and CTest integration is fully functional with 92% test pass rate.
-
-The remaining 36 "failures" consist of:
- 27 tests not run (DDS/AES executables not built - expected)
- 9 test infrastructure failures (not Qt6 migration bugs)
-
-**Migration Status: ✅ COMPLETE**
-
---
-
-*Generated: 2026-09-17*  
-*Branch: showcase/unittest-and-validate-step-integration-in-lts-svc-s*  
-*Build: build_full24.log*
@@ -8,6 +8,7 @@
 */

 #include "aar_application.h"
+#include <utility>
 #include "ui_aarApp.h"
 #include "databases_model.h"

@@ -44,7 +45,7 @@ AarApplication::AarApplication(QWidget *parent)

  const QList<QScreen*> &screenList = QGuiApplication::screens();
  m_widgets.reserve(screenList.size());
-  for (QScreen *s : qAsConst(screenList))
+  for (QScreen *s : std::as_const(screenList))
  {
    QWidget *w = new QWidget(); // no parent
    w->setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint);
@@ -86,7 +87,7 @@ AarApplication::~AarApplication()
  delete m_databasesModel;
  delete m_progressDialog;

-  for (QSqlDatabase db : qAsConst(m_dbMap))
+  for (QSqlDatabase db : std::as_const(m_dbMap))
    db.close();

  m_dbPostgres.close();
@@ -56,13 +56,13 @@ bool DatabasesModel::initModel(const QSqlDatabase &db)
    }

    Exercise exercise;
-    exercise.m_id        = q.value(0).toInt();
+    exercise.id        = q.value(0).toInt();
    exercise.name      = q.value(1).toString();
    exercise.startTime = q.value(2).toLongLong();
    exercise.endTime   = q.value(3).toLongLong();
-    exercise.dbName    = QStringLiteral("lts_db_") + QString::number(exercise.m_id);
+    exercise.dbName    = QStringLiteral("lts_db_") + QString::number(exercise.id);
    exercise.stateId   = q.value(4).toInt();
-    TRACE_LOG(m_logger) << "Found exercise with id=" << exercise.m_id << ", name=" << exercise.name << ", startTime="
+    TRACE_LOG(m_logger) << "Found exercise with id=" << exercise.id << ", name=" << exercise.name << ", startTime="
                        << exercise.startTime << ", endTime=" << exercise.endTime << ", dbName=" << exercise.dbName
                        << ", stateId=" << exercise.stateId;
    if (exercise.stateId != 6)
@@ -86,7 +86,7 @@ QVariant DatabasesModel::data(const QModelIndex &index, int role) const
  switch (index.column())
  {
  case Id:
-    return e.m_id;
+    return e.id;
  case Name:
    return QString(e.name);
  case StartTime:
@@ -176,7 +176,7 @@ void DatabasesModel::onDataChanged(const Exercise &data, DataModification modTyp
    row = m_vecData.indexOf(data);
    if (row != -1)
      if (removeRow(row))
-        emit dataChanged(index(std::min(row, m_vecData.size()-1), Columns::Id), index(m_vecData.size()-1, Columns::EndTime));
+        emit dataChanged(index(std::min<qsizetype>(row, m_vecData.size() - 1), Columns::Id), index(m_vecData.size()-1, Columns::EndTime));
    return;
  } // switch
 }
@@ -32,8 +32,8 @@ struct Exercise
  qint64 endTime = 0;
  qint32 stateId = 0;

-  bool operator == (const Exercise &other) { return id == other.m_id; }
-  bool operator != (const Exercise &other) { return id != other.m_id; }
+  bool operator == (const Exercise &other) const { return id == other.id; }
+  bool operator != (const Exercise &other) const { return id != other.id; }
 };


@@ -46,8 +46,7 @@ int main(int argc, char *argv[])
  QCoreApplication::setApplicationName(QLatin1String("AarApplication"));
  QCoreApplication::setOrganizationName(QLatin1String("RME"));

-  if (!bHeadless)
-    app->setAttribute(Qt::AA_UseHighDpiPixmaps);
+  // Qt::AA_UseHighDpiPixmaps: no-op since Qt6 (high-DPI pixmaps are always enabled)


  NGL::LoggerHandler *lh = dynamic_cast<NGL::LoggerHandler*>(app.data());
@@ -6,4 +6,4 @@

 ADD_SUBDIRECTORY(AarApp)
 ADD_SUBDIRECTORY(OpApp)
-ADD_SUBDIRECTORY(THP)
+# ADD_SUBDIRECTORY(THP)  # Disabled: VLC dependency not available
@@ -38,7 +38,7 @@ ENDIF()

 if(QT6_GUI_AVAILABLE)
  NGL_TARGET_LINK_LIBRARIES(OperatorApplication
-    ArcGISQt5Hack   # make sure it's loaded *before* libEsriCommonQt.so
+    $<IF:$<TARGET_EXISTS:ArcGISQt5Hack>,ArcGISQt5Hack,>   # make sure it's loaded *before* libEsriCommonQt.so (guard: only linked when the SituationMap viewer is built, matching CentralEffectSimulation)
    ${Qt6_Widgets}
    Qt6::Network
    nglapplication
@@ -36,6 +36,8 @@
 #include <QInputDialog>
 #include <QNetworkProxy>
 #include <QtCore/QTimer>
+#include <QInputDevice>
+#include <algorithm>


 class CmdLineParser : public LtsCommandLineParser::LtsCommandLineParser
@@ -157,7 +159,7 @@ public:
  bool isForcedTabletMode() const { return isSet(QStringLiteral("x")); }
  bool isForcedWSMode() const { return isSet(QStringLiteral("w")); }
  QString langIsoCode() const { return value(QStringLiteral("l")); }
-  QStringList ignoredPlugins() const { return value(QStringLiteral("ignore-plugins")).split(QLatin1Char(','), QString::SkipEmptyParts); }
+  QStringList ignoredPlugins() const { return value(QStringLiteral("ignore-plugins")).split(QLatin1Char(','), Qt::SkipEmptyParts); }
  bool checkRequirements() const { return isSet(QStringLiteral("check-requirements")); }
  QString skipScreen() const { return value(QStringLiteral("k")); }
  QString qosFile() const {  return value(QStringLiteral("q")).size() > 0 ?  value(QStringLiteral("q")) : QString(); }
@@ -172,7 +174,10 @@ public:
 // ------------------------------------------------------------------
 int main(int argc, char **argv) // TODO: json strings to lower
 {
-  qsrand(time(nullptr));
+  // (legacy: qsrand(time(nullptr));) — the Qt5 global RNG (qrand/qsrand) does not exist in Qt6.
+  // QRandomGenerator::global() is auto-seeded (non-deterministically) by Qt, and calling ->seed()
+  // on the global/system generator aborts in Qt 6.10 ("Attempted to overwrite a QRandomGenerator to
+  // system() or global()"), so no explicit seed is needed here.

  QCoreApplication::setAttribute(Qt::AA_UseDesktopOpenGL);

@@ -187,7 +192,7 @@ int main(int argc, char **argv) // TODO: json strings to lower
  NGLApplication app(argc, argv);
  app.createLogger("opApp");
  QApplication::setQuitOnLastWindowClosed(false); // we are cool enough to handle it ourselves 8)
-  QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
+  // Qt::AA_UseHighDpiPixmaps: no-op since Qt6 (high-DPI pixmaps are always enabled)
  QNetworkProxy::setApplicationProxy(QNetworkProxy()); // do NOT use proxies anywhere!

  NGL::LoggerHandler *lh = NGL::LoggerHandler::getLoggerHandler();
@@ -380,7 +385,7 @@ int main(int argc, char **argv) // TODO: json strings to lower

  if (!skipScreen.isEmpty())
  {
-    QStringList skipScreenList(skipScreen.split(QLatin1Char('.'), QString::SkipEmptyParts));
+    QStringList skipScreenList(skipScreen.split(QLatin1Char('.'), Qt::SkipEmptyParts));

    int skipScreenListCount = skipScreenList.count();

@@ -431,7 +436,8 @@ int main(int argc, char **argv) // TODO: json strings to lower
    sessionData->setAsTablet();
  else if (options.isForcedWSMode())
    sessionData->setAsTablet(false);
-  else if (!QTouchDevice::devices().isEmpty())
+  else if (std::any_of(QInputDevice::devices().cbegin(), QInputDevice::devices().cend(),
+                       [](const QInputDevice *dev) { return dev && dev->type() == QInputDevice::DeviceType::TouchScreen; }))
    sessionData->setAsTablet();
  LtsWidgets::LtsComboBox::setUseSelectionDialog(sessionData->isTablet());

@@ -72,7 +72,7 @@ NGL_TARGET_COMPILE_DEFINITIONS(thp_viewer
    ${VLC_DEFINES}
 )
 NGL_TARGET_LINK_LIBRARIES(thp_viewer
-  ArcGISQt5Hack   # make sure it's loaded *before* libEsriCommonQt.so
+  $<IF:$<TARGET_EXISTS:ArcGISQt5Hack>,ArcGISQt5Hack,>   # make sure it's loaded *before* libEsriCommonQt.so (guard: only linked when the SituationMap viewer is built, matching CentralEffectSimulation)

  ${VLC_LIBRARIES}
  Qt6::Core
@@ -23,7 +23,7 @@ int main(int argc, char **argv)
  QNetworkProxy::setApplicationProxy(QNetworkProxy());
  NGLApplication app(argc, argv);
  app.createLogger("SRP");
-  app.setAttribute(Qt::AA_UseHighDpiPixmaps);
+  // Qt::AA_UseHighDpiPixmaps: no-op since Qt6 (high-DPI pixmaps are always enabled)

  SituationReplay::ConnectionParams connParams;
  connParams.domainId = 1;
@@ -50,7 +50,7 @@ int main(int argc, char **argv)
  app.createLogger("THP", "log4cxx_thp_viewer.props");
  app.setOrganizationName(QStringLiteral("RME"));
  app.setApplicationName(QStringLiteral("thp_viewer"));
-  app.setAttribute(Qt::AA_UseHighDpiPixmaps);
+  // Qt::AA_UseHighDpiPixmaps: no-op since Qt6 (high-DPI pixmaps are always enabled)

  QDir::setSearchPaths(QLatin1String("icon"), QStringList(QLatin1String(":/style/")));
  Q_INIT_RESOURCE(rme_light_style);
@@ -258,8 +258,9 @@ void ThpViewer::onLinkClicked(const QUrl &url)
  const QString path = url.path();
  const QString lpath = path.toLower();

-  const QStringRef ext = lpath.splitRef(QLatin1Char('.')).last();
-  const QStringRef ext2Chars = ext.left(2);
+  // Use QStringView for efficient string operations
+  const QStringView ext = QStringView{lpath}.split(QLatin1Char('.')).last();
+  const QStringView ext2Chars = ext.left(2);

  ui->audioWidget->stop();
  ui->videoWidget->stop();
@@ -370,7 +371,7 @@ void ThpViewer::onLinkClicked(const QUrl &url)
    ui->backButton->setEnabled(true);
  }
  else if (ext == QLatin1String("html") &&
-           lpath.midRef(lpath.lastIndexOf(QLatin1Char('/')) + 1).startsWith(QLatin1String("combined_")))
+           QStringView{lpath}.mid(lpath.lastIndexOf(QLatin1Char('/')) + 1).startsWith(QLatin1String("combined_")))
  {
    // Kombiniert
    QHash<QString, QUrl> urls = getCombinedPlaybackDetails(url);
@@ -449,9 +450,8 @@ QHash<QString, QUrl> ThpViewer::getCombinedPlaybackDetails(const QUrl &url) cons
  QDomDocument doc(QStringLiteral("RSS"));
  if (!file.open(QIODevice::ReadOnly))
    return hash;
-  QString errorStr;
-  int errorLine, errorColumn;
-  if (!doc.setContent(&file, true, &errorStr, &errorLine, &errorColumn))
+  const auto parseResult = doc.setContent(&file, QDomDocument::ParseOption::UseNamespaceProcessing);
+  if (!parseResult)
  {
    file.close();
    return hash;
@@ -9,7 +9,7 @@

 #include "thp_building_settings.h"
 #include "ui_thp_building_settings.h"
-#include <Common/bdv_controller.h>
+#include <BuildingViewer/Common/bdv_controller.h>

 #include <LtsUtilsSettings/settings.h>

@@ -32,10 +32,10 @@ public:
  bool needsToBeOpenedExternally(const QUrl &url)
  {
    const QString lpath = url.toString();
-    const QStringRef ext = lpath.splitRef(QLatin1Char('.')).last();
-    const QStringRef ext2Chars = ext.left(2);
+    const QStringView ext = QStringView{lpath}.split(QLatin1Char('.')).last();
+    const QStringView ext2Chars = ext.left(2);
    if (ext == QLatin1String("html") &&
-        lpath.midRef(lpath.lastIndexOf(QLatin1Char('/')) + 1).startsWith(QLatin1String("combined_")))
+        QStringView{lpath}.mid(lpath.lastIndexOf(QLatin1Char('/')) + 1).startsWith(QLatin1String("combined_")))
      return true;
    // PDF
    if (ext == QLatin1String("pdf"))
@@ -7,6 +7,7 @@
  */

 #include "thp_situation_widget.h"
+#include <utility>
 #include "ui_thp_situation_building_base.h"

 #include "thp_situation_filter_aes.h"
@@ -384,7 +385,7 @@ bool SituationWidget::restoreOperatorMapSettingsOverlays(const SituationMap::Ope
  // So we have to do it here:
  const QList<int> &orderedOverlayIds = oms.orderedOverlays;
  DEBUG_LOG(m_logger) << LOGFUNCTION << " restore OverlayIds...";
-  for (auto overlayId : qAsConst(orderedOverlayIds))
+  for (auto overlayId : std::as_const(orderedOverlayIds))
  {
    DEBUG_LOG(m_logger) << LOGFUNCTION << " applyNewOverlay , overlayId=" << overlayId;
    applyNewOverlay(overlayId);
@@ -16,7 +16,9 @@ else()
 endif()

 # Add only existing subdirectories to allow partial checkouts / incremental migration
-set(LTS_SUBDIRS Tools Application DDS Common Services Proxies Plugins Viewer Projects)
+# Release 2 scope: Tools, DDS, Common, Services (minimal), Proxies (TrainingAreaBase only), Plugins (Styles only for LtsWidgets dependency)
+# Excluded: Application, Viewer, Projects, most Plugins (not in Release 2)
+set(LTS_SUBDIRS Tools DDS Common Services Proxies Plugins)
 foreach(dir IN LISTS LTS_SUBDIRS)
  if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${dir}")
  # Use guarded add so top-level MIGRATE_MODULE can restrict which Lts subdirs are included
@@ -4,30 +4,27 @@
 # $Author$
 #

+# Release 2 Common modules (S set: 16 modules)
 ADD_SUBDIRECTORY(CodeGen)
 ADD_SUBDIRECTORY(httq)
 ADD_SUBDIRECTORY(LtsAppDescriptor)
-ADD_SUBDIRECTORY(LtsAppManager)
 ADD_SUBDIRECTORY(LtsCommandLineParser)
-ADD_SUBDIRECTORY(LtsCoordinate)
 ADD_SUBDIRECTORY(LtsCoordTrans)
-ADD_SUBDIRECTORY(LtsElevation)
+ADD_SUBDIRECTORY(LtsCoordinate)
+# LtsElevation excluded from Release 2a (depends on AssetManagement, needed only by Release 2b services)
+# ADD_SUBDIRECTORY(LtsElevation)
 ADD_SUBDIRECTORY(LtsLicence)
-ADD_SUBDIRECTORY(LtsLogin)
-ADD_SUBDIRECTORY(LtsMultiMonitor)
 ADD_SUBDIRECTORY(LtsNotification)
 ADD_SUBDIRECTORY(LtsPluginManager)
-ADD_SUBDIRECTORY(LtsPrinting)
-ADD_SUBDIRECTORY(LtsProjectionWorkstation)
-ADD_SUBDIRECTORY(LtsRestClient)
-ADD_SUBDIRECTORY(LtsScriptTimeline)
-ADD_SUBDIRECTORY(LtsSerialPortQuerry)
 ADD_SUBDIRECTORY(LtsSession)
-ADD_SUBDIRECTORY(LtsTimeline)
+ADD_SUBDIRECTORY(LtsRestClient)
+ADD_SUBDIRECTORY(LtsSerialPortQuerry)
 ADD_SUBDIRECTORY(LtsUtils)
-ADD_SUBDIRECTORY(LtsVirtualKeyboard)
 ADD_SUBDIRECTORY(LtsWebSocket)
 ADD_SUBDIRECTORY(LtsWidgets)
-ADD_SUBDIRECTORY(PluginInterfaces)
 ADD_SUBDIRECTORY(ProjectConfig)
 ADD_SUBDIRECTORY(TopicEditorBase)
+# LtsMultiMonitor and PluginInterfaces required by LtsSession for Release 2a
+ADD_SUBDIRECTORY(LtsMultiMonitor)
+ADD_SUBDIRECTORY(PluginInterfaces)
+# Excluded from Release 2: LtsAppManager, LtsLogin, LtsPrinting, LtsProjectionWorkstation, LtsScriptTimeline, LtsTimeline, LtsVirtualKeyboard
@@ -69,7 +69,7 @@ QString MemberInformationWrapper::ddsToJsonElement() const
        return QStringLiteral("obj[QStringLiteral(\"") + cppMemberName() + QStringLiteral("\")] = ") + cppToJsonPre() +
               QStringLiteral("element.") + memberAccess + cppToJsonPost();

-    const QString optionalAccess = cppMemberName() + QStringLiteral(".is_set()");
+    const QString optionalAccess = cppMemberName() + QStringLiteral(".has_value()");
    const QString getValue = cppMemberName();
    return QStringLiteral("if (element.") + optionalAccess + QStringLiteral(") ") +
           QStringLiteral("obj[QStringLiteral(\"") + cppMemberName() + QStringLiteral("\")] = ") + cppToJsonPre() +
@@ -83,12 +83,12 @@ bool XmlReader::readServiceFile(const QString& svcFile, const QString& idlServic
    INFO_LOG(m_logger) << "SvcFile: " << svcFile;

    QDomDocument doc;
-    auto parseResult = doc.setContent(&f);
+    const auto parseResult = doc.setContent(&f);
    if (!parseResult)
    {
        m_errorString = QLatin1String("Error parsing service file '") + svcFile + QLatin1String("' at line ") +
-                        QString::number(parseResult.errorLine) + QLatin1Char(':') +
-                        QString::number(parseResult.errorColumn);
+                        QString::number(int(parseResult.errorLine)) + QLatin1Char(':') +
+                        QString::number(int(parseResult.errorColumn));
        ERROR_LOG(m_logger) << m_errorString;
        return false;
    }
@@ -184,9 +184,28 @@ class DtsGenerator(object):

 class DtcGenerator(object):
    def generate( self, outfile, parser ):
-        outputHeader( outfile, parser, 'DTC' )
        outfile.write('\n')
+        outfile.write('/**\n')
+        outfile.write('* %s definitions\n' % 'DTC')
+        outfile.write('*/\n')
+        outfile.write('\n')
+        outfile.write('// warning: this file is generated with command\n')
+        outfile.write('// %s\n' % ( " ".join(sys.argv) ))
+        outfile.write('// at %s\n' % time.strftime( '%c' ))
+        outfile.write('// it will be overwritten by next run - do not modify!\n')
+        outfile.write('\n')
+        outfile.write('#pragma once\n')
+        outfile.write('\n')
+        # Include Qt headers FIRST to avoid namespace conflicts with DDS
+        outfile.write('#include <QtCore/QObject>\n')
+        outfile.write('#include <QtCore/QTimer>\n')
+        outfile.write('\n')
+        # Include DDS headers BEFORE project headers to avoid namespace conflicts
        outfile.write('#include <DDS/Generic/generic_data_reader.h>\n')
+        outfile.write('#include <DDS/DTC/generic_dtc.h>\n')
+        outfile.write('#include <DDS/DTC/generic_dtc_impl.h>\n')
+        outfile.write('\n')
+        outfile.write('#include "%s.hpp"\n' % ( parser.service_abbr ))
        outfile.write('\n')
        outfile.write('/**\n')
        outfile.write(' * Type definitions \n')
@@ -13,13 +13,18 @@
 {% if custom_dtc_procs %}
 #include <{{ include_prefix }}/{{ namespace_abbr }}_dtc_impl_custom.h>
 {% endif %}
+#include <NGLLogger/INGLLogger.h>
 #include <DDS/DTC/generic_dtc_impl.h>
+#include <DDS/Core/logger.h>
 #include <dds/core/cond/StatusCondition.hpp>
 #include <dds/core/cond/WaitSet.hpp>
 #include <unordered_map>
 #include <QCoreApplication>
 #include <QThread>

+using namespace NGL;
+using namespace Core;
+
 namespace {{ namespace }}
 {
 namespace Interface
@@ -51,7 +56,7 @@ std::shared_ptr<Dtc> Dtc::create(const std::shared_ptr<DDSConnector::DdsConnecto
  auto ret = std::make_shared<DtcImpl>(ddsConnector);
  {% endif %}
  s_availableConnectors.insert(std::make_pair(ddsConnector.get(), ret));
-  return std::move(ret);  // c++11 defect
+  return ret;  // moved implicitly (C++17; explicit std::move on a local triggers -Wredundant-move)
 }

 // DtcImpl
@@ -10,11 +10,15 @@
 // filename: {{ namespace_abbr }}_dtc_impl.h
 #pragma once

+#include <DDS/DTC/generic_dtc.h>
+#include <DDS/DTC/generic_dtc_impl.h>
+#include <DDS/Generic/generic_data_reader.h>
+#include <DDS/DDSConnector/dds_connector.h>
+
 #include <{{ include_prefix }}/{{ namespace_abbr }}_dtc.h>
 #include <{{ include_prefix }}/{{ namespace_abbr }}_dtc_types.h>
 #include <{{ include_prefix }}/logger.h>
-
-#include <DDS/DDSConnector/dds_connector.h>
+using namespace NGL;

 #if !defined(MAKE_SVC{{ namespace_abbr_upper }}CLIENT_LIB)
 #error "You are not allowed to include this file in your code!"
@@ -92,6 +96,12 @@ protected:
 {% endif %} {% endif %} {% endfor %}

  LOGGER_T m_logger;
+
+signals:
+{% for dt in dataTopics.member %}
+{% if dt.dtcImpl %}
+  void {{ dt.nameFlc }}Changed(const ::{{ namespace }}::{{ dt.type }} &data, DataModification modType);
+{% endif %} {% endfor %}
 };

 } // namespace Interface
@@ -46,7 +46,7 @@ Q_DECL_EXPORT std::shared_ptr<Ftc> Ftc::create(const std::shared_ptr<DDSConnecto

  auto ret = std::make_shared<FtcImpl>(ddsConnector);
  s_availableConnectors.insert(std::make_pair(ddsConnector.get(), ret));
-  return std::move(ret);  // c++11 defect
+  return ret;  // moved implicitly (C++17; explicit std::move on a local triggers -Wredundant-move)
 }

 // FtcImpl
@@ -8,6 +8,7 @@
 {% autoescape off %}
 // filename: {{ namespace_abbr }}_fts_impl.h
 #pragma once
+#include <DDS/FTS/generic_fts_impl.h>
 #include <{{ include_prefix }}/{{ namespace_abbr }}_fts.h>
 #include <{{ include_prefix }}/{{ namespace_abbr }}_fts_types.h>
 #include <{{ include_prefix }}/logger.h>
@@ -171,8 +171,20 @@ std::vector<T> fromJson(const QVariant &jsonData, type<std::vector<T>>)
  return ret;
 }

+// Primary fallback for any migrated plain-`enum class` enumerators that have no
+// explicit specialization below - most importantly the nested foreign
+// ProjectDataManagement / Core enums a plugin reads back from the database (they are
+// not in this service's idl_enums, so the per-own-enum specializations do not cover
+// them). Giving the primary template a body (rather than leaving it declaration-only)
+// is what lets those foreign-enum instantiations resolve, so the plugin .so links. The
+// explicit specializations for primitives / own enums / structs / vectors / optionals
+// all take precedence over this fallback, so it is only ever instantiated for an enum
+// type, where `static_cast<T>(val.toInt())` is the correct conversion.
 template<typename T>
-T fromQVariant(const QVariant &val, type<T>);
+T fromQVariant(const QVariant &val, type<T>)
+{
+  return static_cast<T>(val.toInt());
+}

 template<>
 bool fromQVariant(const QVariant &val, type<bool>)
@@ -266,6 +278,23 @@ T fromQVariant(const QVariant &val)
  return fromQVariant(val, type<T>{});
 }

+// rtiddsgen 7.7 spells the migrated enumerators as plain `enum class` in the service
+// namespace (the legacy dds::core::safe_enum<T> wrapper is gone). The record_replay
+// plugin still instantiates fromQVariant<Enum>() for each enum member it reads back,
+// and none of the generic overloads above are ever deduced for those types, so each of
+// this service's own enumerations needs its own explicit specialization. `idl_enums`
+// carries the service's own enumerations by local name and this block runs inside
+// `namespace {{ namespace }}`, so the local name resolves to the fully-qualified enum
+// type. (Nested foreign PDM enumerations are still not covered - same limitation as the
+// documented svcBuildings exclusion.)
+{% for enumeration in idl_enums %}
+template<>
+{{ enumeration.name }} fromQVariant(const QVariant &val, type<{{ enumeration.name }}>)
+{
+  return static_cast<{{ enumeration.name }}>(val.toInt());
+}
+{% endfor %}
+
 {% for dt in serializeTopics.member %}
 //
 // Begin {{ dt.typeFq }}
@@ -121,7 +121,7 @@ protected:
  int64_t                                                m_snapshot{{ dt.name }}MapTime = -1;  // time for which the snapshot is valid
 {% endif %} {% endfor %}

-  LOGGER_T                                                 m_logger;
+  NGL::INGLLogger&                                         m_logger;
 };

 }
@@ -113,7 +113,7 @@ AppDescriptionVector LtsAppDescriptor::getAppDescriptionVector(const QByteArray&
        int column = 0;
        QChar x = QLatin1Char('\n');

-        for (int i = 0; i < jsonDocument.count(); i++)
+        for (int i = 0; i < jsonDocument.size(); i++)
        {
            if (i == parseError.offset)
                break;
@@ -140,7 +140,7 @@ void LtsAppManager::slotStartDebugServer()
            QString commandStr(
                QString::fromUtf8(client->readLine(100)).remove(QStringLiteral("\r")).remove(QStringLiteral("\n")));

-            QStringList argList = commandStr.split(QLatin1Char(' '), QString::SplitBehavior::SkipEmptyParts);
+            QStringList argList = commandStr.split(QLatin1Char(' '), Qt::SkipEmptyParts);

            if (argList.count() < 1)
                return;
@@ -78,8 +78,8 @@ class LtsElevationManager::Private

 LtsElevationManager::LtsElevationManager()
    : QObject(nullptr)
-    , m_logger(getLogger("LtsElevationManager"))
    , d(new Private)
+    , m_logger(getLogger("LtsElevationManager"))
 {
    ++s_counter;
    TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, s_counter=" << s_counter << " this=" << this;
@@ -20,15 +20,13 @@ QVector<Licence> readLicences(const QByteArray& unencryptedXmlData)
    QVector<Licence> licenceVec;

    QDomDocument xmlDoc;
-    QString errorMsg;
-    int errorLine = 0;
-    int errorColumn = 0;

-    if (!xmlDoc.setContent(unencryptedXmlData, &errorMsg, &errorLine, &errorColumn))
+    const auto parseResult = xmlDoc.setContent(unencryptedXmlData);
+    if (!parseResult)
    {
        ERROR_LOG(getLogger()) << "Error reading xml data, "
-                               << "error in line " << errorLine << ", column " << errorColumn
-                               << ", message: " << errorMsg;
+                               << "error in line " << int(parseResult.errorLine) << ", column " << int(parseResult.errorColumn)
+                               << ", message: " << parseResult.errorMessage;
        return licenceVec;
    }

@@ -16,7 +16,7 @@ LogoutInformationDialog::LogoutInformationDialog(int timeOut, AssetManagement::S
 {
    m_ui->setupUi(this);
    QString actionText;
-    switch (shutdownAction.underlying())
+    switch (shutdownAction)
    {
        case AssetManagement::ShutdownAction::NoAction:
        case AssetManagement::ShutdownAction::Logout:
@@ -154,13 +154,13 @@ void LtsLogin::slotLogoutShutdown(const AssetManagement::WorkstationLogout& data

    if (!m_asmDtc->isAssetEnabled())
        m_asmDtc->enableAsset();
-    for (int id : data.ids())
+    for (int id : data.ids)
    {
-        if (QString::fromStdString(m_asmDtc->asset(id).name())
+        if (QString::fromStdString(m_asmDtc->asset(id).name)
                .compare(LtsSession::LtsSession::workstationName(), Qt::CaseInsensitive) == 0)
        {
            m_isInLogoutDialog = true;
-            showLogoutInformationDialog(data.shutdownAction());
+            showLogoutInformationDialog(data.shutdownAction);
            break;
        }
    }
@@ -250,7 +250,7 @@ void LtsLogin::logoff()
    m_loginApp = nullptr;

    QString cmd;
-    switch (m_shutdownAction.underlying())
+    switch (m_shutdownAction)
    {
        case AssetManagement::ShutdownAction::Shutdown:
 #ifdef LTS_DEBUG
@@ -9,6 +9,8 @@
 */

 #include "lts_plugin_loader.h"
+#include <memory>
+#include <utility>

 #include <NGLLogger/NGLLoggerBootstrap.h>
 #include <LtsAppDescriptor/lts_app_descriptor.h>
@@ -56,7 +58,7 @@ LtsPluginLoader::~LtsPluginLoader()

 void LtsPluginLoader::unloadAllPlugins()
 {
-  for (auto &pi : qAsConst(m_loadedPlugins))
+  for (auto &pi : std::as_const(m_loadedPlugins))
  {
    QPluginLoader *pluginLoader = pi.pluginLoader;

@@ -280,7 +282,7 @@ bool LtsPluginLoader::loadPlugins(PluginType requestedPluginType,
    //      continue;
    //    }

-    QScopedPointer<QPluginLoader> pluginLoader(new QPluginLoader);
+    std::unique_ptr<QPluginLoader> pluginLoader(new QPluginLoader);
    pluginLoader->setFileName(absoluteFilePath);

    const QJsonObject jObj = pluginLoader->metaData();
@@ -293,8 +295,7 @@ bool LtsPluginLoader::loadPlugins(PluginType requestedPluginType,
    }

    const QString jsonIid = iid.value().toString().toLower(); // LOWERCASE ! (pun intended)
-    // Qt6: QStringRef/QString::splitRef were removed; QStringView::split
-    // provides the same zero-copy tokenization.
+    // Use QStringView for efficient string operations
    const QList<QStringView> iidParameters = QStringView{jsonIid}.split(QLatin1Char(':'));

    DEBUG_LOG(logger) << "Plugin " << absoluteFilePath << " provides iid '" << jsonIid;
@@ -433,7 +434,7 @@ bool LtsPluginLoader::loadPlugins(PluginType requestedPluginType,
    pi.fileName = filename;
    pi.fullFileName = absoluteFilePath;
    pi.plugin = plugin;
-    pi.pluginLoader = pluginLoader.data();
+    pi.pluginLoader = pluginLoader.get();

    if (loadPlugin && !loadPlugin(pi)) // does the dev want this plugin? if no, unload it!   TODO: really unload? or still cache it??
    {
@@ -442,7 +443,7 @@ bool LtsPluginLoader::loadPlugins(PluginType requestedPluginType,
      pluginLoader->unload();
      continue; // next plugin
    }
-    pi.pluginLoader = pluginLoader.take();
+    pi.pluginLoader = pluginLoader.release();

    // the dev decided to use that plugin, so cache it
    m_loadedPlugins.insert(PluginKey(requestedPluginType, pluginName), pi);
@@ -21,7 +21,7 @@ namespace LtsPluginManager

 LtsPluginManager::LtsPluginManager()
  : m_sessionManager(new LtsSession::LtsSessionManager)
-  .getNGLLogger("LtsPluginManager"))
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("LtsPluginManager"))
  , m_markedForDeletion(false)
 {
    connect(m_sessionManager, &LtsSession::LtsSessionManager::signalQuit, this, &LtsPluginManager::signalQuit);
@@ -17,7 +17,13 @@ SET(SRCS
  printing.h
 )

-if (KDReports_FOUND AND QT6_GUI_AVAILABLE AND BUILD_CODIFICATION)
+# Legacy always built the real LtsPrinting when KDReports was available
+# (FIND_PACKAGE(KDReports REQUIRED)); it is a common lib consumed by many
+# targets (e.g. SitmapGuiPlugin::doPrint -> LtsPrinting::printImage), so it must
+# NOT be gated on the BUILD_CODIFICATION product flag (which only bundles the
+# CodificationManagement/ReportViewer plugins). Build the real lib whenever
+# KDReports is found; keep the stub only as a KDReports-absent fallback.
+if (KDReports_FOUND AND QT6_GUI_AVAILABLE)
  NGL_ADD_LIBRARY2(WS LtsPrinting SHARED ${SRCS})
  NGL_TARGET_INCLUDE_DIRECTORIES(LtsPrinting
    PUBLIC
@@ -38,5 +44,7 @@ if(QT6_GUI_AVAILABLE)
 endif()
  NGL_INSTALL_TARGET(LtsPrinting)
 else()
-  message(STATUS "KDReports not found or BUILD_RTI disabled; skipping LtsPrinting target")
+  message(STATUS "KDReports not found or Qt6 GUI unavailable; building LtsPrinting stub (link-only, no printing symbols)")
+  add_library(LtsPrinting SHARED lts_printing_stub.cpp)
+  NGL_INSTALL_TARGET(LtsPrinting)
 endif()
@@ -0,0 +1,14 @@
+// LtsPrinting link stub for the Qt6 migration.
+//
+// The real LtsPrinting library requires KDReports (a Qt5/KDE print-reporting
+// library that is not available in the Qt6 toolchain). When KDReports is not
+// found the real library is skipped (see CMakeLists.txt); this stub provides a
+// linkable `LtsPrinting` target so that consumers referencing the target name
+// (e.g. SmoCheckButtonHandler) still link. It exports no printing symbols.
+namespace lts_printing_stub
+{
+int lts_printing_stub_marker()
+{
+  return 0;
+}
+}
@@ -84,7 +84,7 @@ void printView(LtsSession::LtsSession* session, QWidget* dialogParent, const QAb

    doc.setMetaInformation(QTextDocument::DocumentTitle, dialogParent->windowTitle());
    LtsPrinting::Base nglPrinter(doc, dialogParent, QObject::tr("Print %1").arg(dialogParent->windowTitle()),
-                                 dialogParent->windowTitle(), QPrinter::A4, QPrinter::Landscape);
+                                 dialogParent->windowTitle(), QPageSize(QPageSize::A4), QPageLayout::Landscape);
    if (!nglPrinter.printer())
        return;

@@ -118,8 +118,8 @@ void printView(LtsSession::LtsSession* session, QWidget* dialogParent, QAbstract
 }

 void printImage(LtsSession::LtsSession* session, QWidget* dialogParent, const QImage& image, const QString& imageTitle,
-                const QString& description, const QPrinter::PageSize& pageSize,
-                const QPrinter::Orientation& pageOrientation)
+                const QString& description, const QPageSize& pageSize,
+                const QPageLayout::Orientation& pageOrientation)
 {
    QTextDocument doc;
    QTextCursor cursor(&doc);
@@ -141,7 +141,7 @@ void printImage(LtsSession::LtsSession* session, QWidget* dialogParent, const QI

 void printImages(LtsSession::LtsSession* session, QWidget* dialogParent, const QString& docName,
                 QVector<QImage>& images, QVector<QString>& imageTitles, QVector<QString>& descriptions,
-                 const QPrinter::PageSize& pageSize, const QPrinter::Orientation& pageOrientation)
+                 const QPageSize& pageSize, const QPageLayout::Orientation& pageOrientation)

 {
    QTextDocument doc;
@@ -181,8 +181,8 @@ void printPDFImages(QWidget* dialogParent, const QString& docName, const QString
    QPrinter printer;

    printer.setColorMode(QPrinter::ColorMode::Color);
-    printer.setOrientation(QPrinter::Orientation::Portrait);
-    printer.setPageSize(QPrinter::PageSize::A4);
+    printer.setPageOrientation(QPageLayout::Portrait);
+    printer.setPageSize(QPageSize(QPageSize::A4));
    QString fn = docName;
    fn = fn.remove(QLatin1Char(' '));
    fn = fn.remove(QLatin1String(".."));
@@ -224,7 +224,7 @@ void printReport(LtsSession::LtsSession* session, QWidget* dialogParent, KDRepor

    doc.setMetaInformation(QTextDocument::DocumentTitle, dialogParent->windowTitle());
    LtsPrinting::Base nglPrinter(doc, dialogParent, QObject::tr("Print %1").arg(dialogParent->windowTitle()),
-                                 dialogParent->windowTitle(), QPrinter::A3, QPrinter::Landscape);
+                                 dialogParent->windowTitle(), QPageSize(QPageSize::A3), QPageLayout::Landscape);
    if (!nglPrinter.printer())
        return;

@@ -233,8 +233,8 @@ void printReport(LtsSession::LtsSession* session, QWidget* dialogParent, KDRepor
    cursor.movePosition(QTextCursor::End);

    report.setWidthForEndlessPrinter(0);
-    report.setPageSize(QPrinter::A3);
-    report.setOrientation(QPrinter::Landscape);
+    report.setPageSize(QPageSize::A3);
+    report.setPageOrientation(QPageLayout::Landscape);

    LtsPrinting::Base::printReportData(doc, report);
    nglPrinter.print(&doc);
@@ -249,8 +249,8 @@ void printWidget(LtsSession::LtsSession* session, QWidget* dialogParent, QWidget

    QString windowTitle = dialogParent->windowTitle();
    doc.setMetaInformation(QTextDocument::DocumentTitle, dialogParent->windowTitle());
-    LtsPrinting::Base nglPrinter(doc, dialogParent, QObject::tr("Print %1").arg(windowTitle), windowTitle, QPrinter::A3,
-                                 QPrinter::Landscape);
+    LtsPrinting::Base nglPrinter(doc, dialogParent, QObject::tr("Print %1").arg(windowTitle), windowTitle,
+                                 QPageSize(QPageSize::A3), QPageLayout::Landscape);
    if (!nglPrinter.printer())
        return;

@@ -271,8 +271,8 @@ void printMessage(LtsSession::LtsSession* session, QWidget* dialogParent, const
    QString windowTitle = subject;

    doc.setMetaInformation(QTextDocument::DocumentTitle, subject);
-    LtsPrinting::Base nglPrinter(doc, dialogParent, QObject::tr("Print %1").arg(windowTitle), windowTitle, QPrinter::A4,
-                                 QPrinter::Portrait);
+    LtsPrinting::Base nglPrinter(doc, dialogParent, QObject::tr("Print %1").arg(windowTitle), windowTitle,
+                                 QPageSize(QPageSize::A4), QPageLayout::Portrait);

    QString str = QString(QStringLiteral("<H2><strong>%1</strong> %2 </H2>")).arg(subject).arg(subjectContent);
    str.append(QString(QStringLiteral("<strong>%1</strong> %2<br>")).arg(time).arg(timeContent));
@@ -302,8 +302,8 @@ void printStoryboard(LtsSession::LtsSession* session, QWidget* dialogParent, QAb
    QString windowTitle = dialogParent->windowTitle();
    doc.setMetaInformation(QTextDocument::DocumentTitle, dialogParent->windowTitle());

-    LtsPrinting::Base nglPrinter(doc, dialogParent, QObject::tr("Print %1").arg(windowTitle), windowTitle, QPrinter::A4,
-                                 QPrinter::Portrait);
+    LtsPrinting::Base nglPrinter(doc, dialogParent, QObject::tr("Print %1").arg(windowTitle), windowTitle,
+                                 QPageSize(QPageSize::A4), QPageLayout::Portrait);

    if (!nglPrinter.printer())
        return;
@@ -3,6 +3,8 @@
 #pragma once

 #include <QtPrintSupport/QPrinter>
+#include <QtGui/QPageSize>
+#include <QtGui/QPageLayout>

 #ifndef LTSPRINTING_EXPORT
 #ifdef BUILD_STATIC_LIBRARIES
@@ -42,13 +44,13 @@ LTSPRINTING_EXPORT void printStoryboard(LtsSession::LtsSession* session, QWidget

 LTSPRINTING_EXPORT void printImage(LtsSession::LtsSession* session, QWidget* dialogParent, const QImage& image,
                                   const QString& imageTitle, const QString& description,
-                                   const QPrinter::PageSize& pageSize = QPrinter::A3,
-                                   const QPrinter::Orientation& pageOrientation = QPrinter::Landscape);
+                                   const QPageSize& pageSize = QPageSize(QPageSize::A3),
+                                   const QPageLayout::Orientation& pageOrientation = QPageLayout::Landscape);

 LTSPRINTING_EXPORT void printImages(LtsSession::LtsSession* session, QWidget* dialogParent, const QString& docName,
                                    QVector<QImage>& images, QVector<QString>& imageTitles,
-                                    QVector<QString>& descriptions, const QPrinter::PageSize& pageSize = QPrinter::A3,
-                                    const QPrinter::Orientation& pageOrientation = QPrinter::Landscape);
+                                    QVector<QString>& descriptions, const QPageSize& pageSize = QPageSize(QPageSize::A3),
+                                    const QPageLayout::Orientation& pageOrientation = QPageLayout::Landscape);

 LTSPRINTING_EXPORT void printPDFImages(QWidget* dialogParent, const QString& docName, const QString& printPath,
                                       QVector<QImage>& images);
@@ -50,8 +50,8 @@ Base::Base(QTextDocument &doc,
           QWidget *dialogParent,
           const QString &dialogTitle,
           const QString        &_fn,
-           QPrinter::PaperSize   _ps,
-           QPrinter::Orientation _or,
+           QPageSize             _ps,
+           QPageLayout::Orientation _or,
           QPrinter::ColorMode   _cm) : m_printer(new QPrinter),
    m_painter(new QPainter),
    m_iconFilenameNr(0),
@@ -61,9 +61,9 @@ Base::Base(QTextDocument &doc,
    headersize_(10), headerrule_(0.5), headertext_(HeaderText),
    footersize_(10), footerrule_(0.5), footertext_(FooterText),
    itemFontSize_(2),
-    m_settings(new NGL::Settings(NGL::findProjectConfigFile())).getNGLLogger("NGLPrinting")),
-    m_currentPage(1),
-    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
+    m_settings(new NGL::Settings(NGL::findProjectConfigFile())),
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("NGLPrinting")),
+    m_currentPage(1)
 {
    QString fn = _fn;
    fn = fn.remove(QLatin1Char(' '));
@@ -77,8 +77,8 @@ Base::Base(QTextDocument &doc,
 #endif
    m_printer->setOutputFormat(QPrinter::NativeFormat);

-    m_printer->setPaperSize(_ps);
-    m_printer->setOrientation(_or);
+    m_printer->setPageSize(_ps);
+    m_printer->setPageOrientation(_or);
    m_printer->setColorMode(_cm);

    m_printer->setFullPage(true);
@@ -101,13 +101,13 @@ Base::Base(QTextDocument &doc,
        QAbstractPrintDialog::PrintCollateCopies;
    dialog->setOptions(op);
    QString title = dialogTitle;
-    if (_ps == QPrinter::A2)
+    if (_ps.id() == QPageSize::A2)
        title += QLatin1String(" (A2)");
-    if (_ps == QPrinter::A3)
+    if (_ps.id() == QPageSize::A3)
        title += QLatin1String(" (A3)");
-    if (_ps == QPrinter::A4)
+    if (_ps.id() == QPageSize::A4)
        title += QLatin1String(" (A4)");
-    if (_ps == QPrinter::A5)
+    if (_ps.id() == QPageSize::A5)
        title += QLatin1String(" (A5)");
    dialog->setWindowTitle(title);
    if (dialog->exec() != QDialog::Accepted)
@@ -153,7 +153,7 @@ QString Base::styleSheet()

 QSize Base::printerPageSize() const
 {
-    return QSize(m_printer->pageRect().width() - 2 * DOC_MARGIN, m_printer->pageRect().height() - 2 * DOC_MARGIN);
+    return QSize(m_printer->pageRect(QPrinter::Point).width() - 2 * DOC_MARGIN, m_printer->pageRect(QPrinter::Point).height() - 2 * DOC_MARGIN);
 }

 bool Base::newPage()
@@ -543,7 +543,7 @@ bool Base::printItemData(QString& str, const QAbstractItemModel* model, const QM
        displayString += vdata.toString();

    QString fgColorString;
-    vdata = model->data(mi, Qt::TextColorRole);
+    vdata = model->data(mi, Qt::ForegroundRole);
    if (vdata.isValid())
        fgColorString = vdata.value<QColor>().name();

@@ -684,24 +684,24 @@ bool Base::printReportData(QTextDocument& doc, KDReports::Report& report)
    return true;
 }

-QPrinter::PageSize Base::pageSize() const
+QPageSize Base::pageSize() const
 {
-    return m_printer->pageSize();
+    return m_printer->pageLayout().pageSize();
 }

-void Base::setPageSize(QPrinter::PageSize size)
+void Base::setPageSize(QPageSize size)
 {
    m_printer->setPageSize(size);
 }

-QPrinter::Orientation Base::orientation() const
+QPageLayout::Orientation Base::orientation() const
 {
-    return m_printer->orientation();
+    return m_printer->pageLayout().orientation();
 }

-void Base::setOrientation(QPrinter::Orientation orientation)
+void Base::setOrientation(QPageLayout::Orientation orientation)
 {
-    m_printer->setOrientation(orientation);
+    m_printer->setPageOrientation(orientation);
 }

 double Base::leftMargin() const
@@ -711,7 +711,7 @@ double Base::leftMargin() const

 void Base::setLeftMargin(double margin)
 {
-    if ((margin > 0) && (margin < m_printer->paperRect().width() / 2))
+    if ((margin > 0) && (margin < m_printer->paperRect(QPrinter::Point).width() / 2))
        leftmargin_ = margin;
    else
        leftmargin_ = 0;
@@ -724,7 +724,7 @@ double Base::rightMargin() const

 void Base::setRightMargin(double margin)
 {
-    if ((margin > 0) && (margin < m_printer->paperRect().width() / 2))
+    if ((margin > 0) && (margin < m_printer->paperRect(QPrinter::Point).width() / 2))
        rightmargin_ = margin;
    else
        rightmargin_ = 0;
@@ -737,7 +737,7 @@ double Base::topMargin() const

 void Base::setTopMargin(double margin)
 {
-    if ((margin > 0) && (margin < m_printer->paperRect().height() / 4))
+    if ((margin > 0) && (margin < m_printer->paperRect(QPrinter::Point).height() / 4))
        topmargin_ = margin;
    else
        topmargin_ = 0;
@@ -750,7 +750,7 @@ double Base::bottomMargin() const

 void Base::setBottomMargin(double margin)
 {
-    if ((margin > 0) && (margin < m_printer->paperRect().height() / 4))
+    if ((margin > 0) && (margin < m_printer->paperRect(QPrinter::Point).height() / 4))
        bottommargin_ = margin;
    else
        bottommargin_ = 0;
@@ -758,7 +758,7 @@ void Base::setBottomMargin(double margin)

 void Base::setMargins(double margin)
 {
-    if ((margin > 0) && (margin < m_printer->paperRect().height() / 2) && (margin < m_printer->paperRect().width() / 2))
+    if ((margin > 0) && (margin < m_printer->paperRect(QPrinter::Point).height() / 2) && (margin < m_printer->paperRect(QPrinter::Point).width() / 2))
        leftmargin_ = rightmargin_ = topmargin_ = bottommargin_ = margin;
    else
        leftmargin_ = rightmargin_ = topmargin_ = bottommargin_ = 0;
@@ -771,7 +771,7 @@ double Base::spacing() const

 void Base::setSpacing(double spacing)
 {
-    if ((spacing > 0) && (spacing <= m_printer->paperRect().height() / 8))
+    if ((spacing > 0) && (spacing <= m_printer->paperRect(QPrinter::Point).height() / 8))
        spacing_ = spacing;
    else
        spacing_ = 0;
@@ -784,7 +784,7 @@ double Base::headerSize() const

 void Base::setHeaderSize(double size)
 {
-    if ((size > 0) && (size <= m_printer->paperRect().height() / 8))
+    if ((size > 0) && (size <= m_printer->paperRect(QPrinter::Point).height() / 8))
        headersize_ = size;
    else
        headersize_ = 0;
@@ -817,7 +817,7 @@ double Base::footerSize() const

 void Base::setFooterSize(double size)
 {
-    if ((size > 0) && (size <= m_printer->paperRect().height() / 8))
+    if ((size > 0) && (size <= m_printer->paperRect(QPrinter::Point).height() / 8))
        footersize_ = size;
    else
        footersize_ = 0;
@@ -851,7 +851,7 @@ void Base::setItemFontSize(int itemFontSize)
 QRectF Base::paperRect(QPaintDevice* device)
 {

-    QRectF rect = m_printer->paperRect();
+    QRectF rect = m_printer->paperRect(QPrinter::Point);

    rect.setWidth(rect.width() * device->logicalDpiX() / m_printer->logicalDpiX());
    rect.setHeight(rect.height() * device->logicalDpiY() / m_printer->logicalDpiY());
@@ -930,7 +930,7 @@ void Base::printSinglePage()
    m_tempdoc->setPageSize(contentRect(m_printer).size());

    QTextFrameFormat fmt = m_tempdoc->rootFrame()->frameFormat();
-    fmt.setContentsMargins(0, 0, 0, 0);
+    fmt.setMargin(0);
    m_tempdoc->rootFrame()->setFrameFormat(fmt);

    int doccopies;
@@ -938,11 +938,11 @@ void Base::printSinglePage()
    if (m_printer->collateCopies())
    {
        doccopies = 1;
-        pagecopies = m_printer->numCopies();
+        pagecopies = m_printer->copyCount();
    }
    else
    {
-        doccopies = m_printer->numCopies();
+        doccopies = m_printer->copyCount();
        pagecopies = 1;
    }

@@ -4,6 +4,8 @@

 #include <QtCore/QSet>
 #include <QtPrintSupport/QPrinter>
+#include <QtGui/QPageSize>
+#include <QtGui/QPageLayout>

 namespace NGL
 {
@@ -50,7 +52,7 @@ class Base
 {
  public:
    Base(QTextDocument& doc, QWidget* dialogParent, const QString& dialogTitle, const QString& _fn,
-         QPrinter::PaperSize _ps = QPrinter::A4, QPrinter::Orientation _or = QPrinter::Portrait,
+         QPageSize _ps = QPageSize(QPageSize::A4), QPageLayout::Orientation _or = QPageLayout::Portrait,
         QPrinter::ColorMode _cm = QPrinter::Color);

    virtual ~Base();
@@ -61,13 +63,13 @@ class Base

    static QString styleSheet();

-    QPrinter::PageSize pageSize() const;
+    QPageSize pageSize() const;

-    void setPageSize(QPrinter::PageSize size);
+    void setPageSize(QPageSize size);

-    QPrinter::Orientation orientation() const;
+    QPageLayout::Orientation orientation() const;

-    void setOrientation(QPrinter::Orientation orientation);
+    void setOrientation(QPageLayout::Orientation orientation);

    bool newPage();

@@ -175,7 +175,13 @@ bool CTS::DisconnectRequest::hasValidData() const
    return true;
 }

-LtsProjectionWorkstation::ErrorMessage::ErrorMessage(const QString& uuid, const QString& reason)
+// Unqualified: we are already inside namespace LtsProjectionWorkstation, and the unity
+// build concatenates lts_projection_workstation.cpp (which declares
+// class LtsProjectionWorkstation in this same namespace) into this TU, so
+// "LtsProjectionWorkstation::ErrorMessage" would resolve to the class (which has no
+// such member) instead of the namespace. In a separate TU (legacy structure) the
+// class is not visible here and the qualified name resolved to the namespace.
+ErrorMessage::ErrorMessage(const QString& uuid, const QString& reason)
    : Message(nullptr, nullptr, JsonKeys::ERROR_MESSAGE(), uuid, QJsonValue()), m_reason(reason)
 {
    QJsonObject result;
@@ -183,7 +189,7 @@ LtsProjectionWorkstation::ErrorMessage::ErrorMessage(const QString& uuid, const
    m_replyData = result;
 }

-void LtsProjectionWorkstation::ErrorMessage::process()
+void ErrorMessage::process()
 {
    if (!m_handler || !m_client)
        return;
@@ -192,7 +198,7 @@ void LtsProjectionWorkstation::ErrorMessage::process()
    m_handler->handleMessage(this);
 }

-bool LtsProjectionWorkstation::ErrorMessage::hasValidData() const
+bool ErrorMessage::hasValidData() const
 {
    if (!m_handler || !m_client)
        return false;
@@ -58,7 +58,7 @@ void DragHandler::dragLeaveEvent(QDragLeaveEvent* event)

 void DragHandler::dropEvent(QDropEvent* event)
 {
-    int dropPos = event->pos().x();
+    int dropPos = event->position().toPoint().x();
    int dropTime = m_tcw->m_tools->getTime(dropPos, m_tcw->m_isFilter) - m_tcw->m_dragOffsetTime;

    for (const auto& tcw : std::as_const(m_tcwCorresponding))
@@ -80,7 +80,7 @@ void DragHandler::dropEvent(QDropEvent* event)

 void DragHandler::dragMoveEvent(QDragMoveEvent* event)
 {
-    int pos = event->pos().x();
+    int pos = event->position().toPoint().x();

    if (m_tcw->dragMove(pos))
        event->acceptProposedAction();
@@ -101,7 +101,7 @@ void DragHandler::mouseMoveEvent(QMouseEvent* event)
    if (event->buttons() != Qt::LeftButton)
        return;

-    QPoint cursorPos = m_tcw->mapFromGlobal(event->globalPos());
+    QPoint cursorPos = m_tcw->mapFromGlobal(event->globalPosition().toPoint());

    if (!m_tcw->m_mainSelected || ((cursorPos - m_dragStartPos).manhattanLength() < QApplication::startDragDistance() &&
                                   (m_dragStartPos - cursorPos).manhattanLength() < QApplication::startDragDistance()))
@@ -37,7 +37,7 @@ void TrackHeader::mousePressEvent(QMouseEvent* event)
        return;
    if (!m_indicatorLock)
    {
-        setIndicatorTime(m_tools->getTime(event->localPos().x()));
+        setIndicatorTime(m_tools->getTime(event->position().toPoint().x()));
        emit signalHeaderIndicatorTimeUserChanged(m_indicatorTime);
    }
 }
@@ -19,7 +19,7 @@ void ResizeHandler::mousePressEvent(QMouseEvent* event)
    if (event->buttons() != Qt::LeftButton || !m_possible)
        return;

-    TrackEntry* te = m_trackContentWidget->getTrackEntryOnPos(event->globalPos());
+    TrackEntry* te = m_trackContentWidget->getTrackEntryOnPos(event->globalPosition().toPoint());

    if (te == nullptr)
        return;
@@ -101,7 +101,7 @@ bool ResizeHandler::isCollision(int newLength) const

 bool ResizeHandler::mouseMoveEvent(QMouseEvent* event)
 {
-    QPoint pos = m_trackContentWidget->mapFromGlobal(event->globalPos());
+    QPoint pos = m_trackContentWidget->mapFromGlobal(event->globalPosition().toPoint());
    int posX = pos.x();
    int cursorTime = m_trackContentWidget->m_tools->getTime(posX, m_trackContentWidget->m_isFilter);

@@ -128,7 +128,7 @@ bool ResizeHandler::mouseMoveEvent(QMouseEvent* event)
    }
    else
    {
-        TrackEntry* te = m_trackContentWidget->getTrackEntryOnPos(event->globalPos());
+        TrackEntry* te = m_trackContentWidget->getTrackEntryOnPos(event->globalPosition().toPoint());

        if (m_trackContentWidget->m_isFilter)
        {
@@ -45,7 +45,7 @@ void SelectHandler::mousePressEvent(QMouseEvent* event)
    {
        m_pressedEntry = nullptr;

-        QPoint clickedPos = tcw->mapFromGlobal(event->globalPos());
+        QPoint clickedPos = tcw->mapFromGlobal(event->globalPosition().toPoint());
        int clickedPosY = clickedPos.y();
        int clickedPosX = clickedPos.x();

@@ -133,13 +133,13 @@ void SelectHandler::mousePressEvent(QMouseEvent* event)
            contextMenu->addAction(action);
        }

-        contextMenu->popup(event->globalPos());
+        contextMenu->popup(event->globalPosition().toPoint());
    }
 }

 void SelectHandler::mouseReleaseEvent(QMouseEvent* event)
 {
-    QPoint clickedPos = tcw->mapFromGlobal(event->globalPos());
+    QPoint clickedPos = tcw->mapFromGlobal(event->globalPosition().toPoint());
    int clickedPosX = clickedPos.x();
    int clickedTime = tcw->m_tools->getTime(clickedPosX, tcw->m_isFilter);

@@ -54,7 +54,7 @@ TrackWidget::TrackWidget(int baseWidth, bool readonly, Tools* tools, bool filter
    connect(ui->mainTrack, &TrackContentWidget::signalTrackEntryDeleted, this, &TrackWidget::slotTrackEntryDeleted);
    connect(ui->mainTrack, &TrackContentWidget::signalEditEntry, this, &TrackWidget::signalEditEntry);

-    connect(ui->chkSelect, &QCheckBox::stateChanged, this, &TrackWidget::signalSelectTrack);
+    connect(ui->chkSelect, &QCheckBox::checkStateChanged, this, &TrackWidget::signalSelectTrack);
    connect(ui->pbExpand, &QPushButton::clicked, this, &TrackWidget::slotExpand);
    connect(ui->pbAddFilter, &QPushButton::clicked, this, &TrackWidget::slotAddFilter);
 }
@@ -32,8 +32,10 @@ NGL_TARGET_LINK_LIBRARIES(LtsSessionDataDds
  PRIVATE
    $<$<BOOL:${BUILD_RTI}>:$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>>
  PUBLIC
-    $<$<BOOL:${BUILD_RTI}>:nddscore>
+    $<$<BOOL:${BUILD_RTI}>:RTI::nddscore>
    $<$<BOOL:${BUILD_RTI}>:ddsQoS>
+    # Generated Core type support (topic_type_support<Core::PartitionTime>, ...)
+    $<$<BOOL:${BUILD_RTI}>:$<IF:$<TARGET_EXISTS:ddscore>,ddscore,>>
    NGLLogger
    Qt6::Core
 )
@@ -46,7 +48,9 @@ IF(BUILD_RTI)
      ${CMAKE_BINARY_DIR}/Lts/DDS
  )
  # ddscore target generates core_dtc_types.h
+  IF(TARGET ddscore)
    ADD_DEPENDENCIES(LtsSessionDataDds ddscore)
+  ENDIF()
  NGL_TARGET_LINK_DIRECTORIES(LtsSessionDataDds
    PRIVATE
      ${RTI_LIB_DIR}
@@ -77,7 +81,14 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsSession
 )

 # Optional external dependencies
+# Prefer the in-tree target: a fresh build tree does not have svcCoreClient
+# installed in /usr/local/lib, and the Core::Interface::Ftc::create symbols
+# referenced at link time live in libsvcCoreClient.so
+IF(TARGET svcCoreClient)
+  SET(SVCCORECLIENT_LIBRARY svcCoreClient)
+ELSE()
  FIND_LIBRARY(SVCCORECLIENT_LIBRARY NAMES svcCoreClient PATHS /usr/local/lib /usr/lib NO_DEFAULT_PATH)
+ENDIF()
 FIND_LIBRARY(OHPONLINEHELP_LIBRARY NAMES OhpOnlineHelpViewerGuiPluginInterface PATHS /usr/local/lib /usr/lib NO_DEFAULT_PATH)

 SET(LtsSession_PRIVATE_LIBS
@@ -112,7 +123,7 @@ IF(BUILD_RTI)
    PRIVATE
      ddsconnector
    PUBLIC
-      nddscore
+      RTI::nddscore
  )
  TARGET_COMPILE_DEFINITIONS(LtsSession PUBLIC BUILD_RTI)
 ENDIF()
@@ -9,6 +9,7 @@
 */

 #include "lts_session.h"
+#include <utility>

 #ifdef BUILD_RTI
 #include "lts_session_data_dds.h"
@@ -40,7 +41,9 @@
 #include <LtsWidgets/lts_tab_widget.h>
 #include <PluginInterfaces/data_plugin_interface.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
-#ifdef BUILD_FILTERMANAGEMENT
+// Complete type needed for dynamic_pointer_cast of m_ohvIfc (BUILD_RTI code below);
+// the header is self-contained (Qt only), the FilterManagement plugin is only the implementor.
+#ifdef BUILD_RTI
 #include <Lts/Plugins/OnlineHelp/ohp_online_help_viewer_gui_plugin_interface.h> // XXX: grrr..
 #endif
 #include <QtWidgets/QApplication>
@@ -156,7 +159,7 @@ QString LtsSession::toString() const
    str.append(QStringLiteral(", workspaceId='%1'").arg(workspaceId()));
 #ifdef BUILD_RTI
    str.append(QStringLiteral(", appToString='%1'").arg(appToString(app())));
-    str.append(QStringLiteral(", partitionType=%1, exerciseId='%2'").arg(partitionType()).arg(exerciseId()));
+    str.append(QStringLiteral(", partitionType=%1, exerciseId='%2'").arg(static_cast<int>(partitionType())).arg(exerciseId()));
    str.append(QStringLiteral(", LtsSessionDataDds=%1").arg(LtsSessionDataDds::toString()));
 #else
    str.append(QStringLiteral(", app=Login (stub)"));
@@ -913,6 +916,11 @@ void LtsSession::setExerciseData(const LtsWidgets::ExerciseData& exerciseData)
    emit signalExerciseDataChanged();
 }

+const LtsWidgets::ExerciseData* LtsSession::exerciseData() const
+{
+    return m_exerciseData;
+}
+
 void LtsSession::setProfilePicture(const QPixmap& pixmap)
 {
    // partitionType(); ?!?
@@ -1305,7 +1313,7 @@ void LtsSession::createBaseLayout()
    if (showDeveloperActions)
        addDeveloperActions();

-    for (LtsNotification::LtsNotificationController* ctl : qAsConst(m_notiCtlList))
+    for (LtsNotification::LtsNotificationController* ctl : std::as_const(m_notiCtlList))
    {
        if (!m_baseLayout->notificationExists(ctl->identifier())) // add if non-existent only
            m_baseLayout->addNotification(ctl->createWidget());   // FIXME: crash when no icons?
@@ -20,30 +20,6 @@
 #include <QtCore/QSet>
 #include <QtCore/QVector>

-namespace
-{
-// Convert LtsSession::PartitionType to IDL::PartitionType
-IDL::PartitionType toIdlPartitionType(LtsSession::PartitionType type)
-{
-    switch (type)
-    {
-        case LtsSession::PartitionType::Any:
-            return IDL::PartitionType::Any;
-        case LtsSession::PartitionType::Global:
-            return IDL::PartitionType::Global;
-        case LtsSession::PartitionType::Exercise:
-            return IDL::PartitionType::Exercise;
-        case LtsSession::PartitionType::AllExercises:
-            return IDL::PartitionType::AllExercises;
-        case LtsSession::PartitionType::Replay:
-            return IDL::PartitionType::Replay;
-        case LtsSession::PartitionType::Invalid:
-        default:
-            return IDL::PartitionType::Any;
-    }
-}
-} // namespace
-
 namespace LtsSession
 {
 /**
@@ -74,7 +50,7 @@ class DdsConnectionContainer
        for (int i = ddsConnections.size() - 1; i >= 0; --i)
        {
            const DdsConnection& conn = ddsConnections.at(i);
-            if (toIdlPartitionType(conn.partitionType) != IDL::PartitionType::Global)
+            if (conn.partitionType != IDL::PartitionType::Global)
                continue;
            auto ret = conn.ddsConnector.lock();
            if (ret != nullptr)
@@ -242,7 +218,7 @@ bool LtsSessionDataDds::init(const DdsConnectionParams& connParams)
 #endif

        m_ddsConnector = std::make_shared<DDSConnector::DdsConnector>(
-            connParams.domainId, toIdlPartitionType(connParams.partitionType), connParams.partitionId,
+            connParams.domainId, connParams.partitionType, connParams.partitionId,
            connParams.exerciseId, // same as partition Id in live but not in replay
            type);
        s_ddsConnections()->insertConnection(connParams, m_ddsConnector);
@@ -277,7 +253,7 @@ bool LtsSessionDataDds::init(const dds::domain::DomainParticipant& dp, const Dds
        if (m_ddsConnector == nullptr)
        {
            m_ddsConnector =
-                std::make_shared<DDSConnector::DdsConnector>(dp, toIdlPartitionType(connParams.partitionType), type, connParams.partitionId);
+                std::make_shared<DDSConnector::DdsConnector>(dp, connParams.partitionType, type, connParams.partitionId);

            s_ddsConnections()->insertConnection(connParams, m_ddsConnector);
        }
@@ -292,38 +268,27 @@ Fetcher* LtsSessionDataDds::fetcher(const QString& yourPluginsName)
    return m_fetcher;
 }

-QString LtsSessionDataDds::partitionTypeString(PartitionType partitionType)
+QString LtsSessionDataDds::partitionTypeString(IDL::PartitionType partitionType)
 {
    switch (partitionType)
    {
-        case PartitionType::AllExercises:
+        case IDL::PartitionType::AllExercises:
            return QStringLiteral("AllExercises");
-        case PartitionType::Any:
+        case IDL::PartitionType::Any:
            return QStringLiteral("Any");
-        case PartitionType::Exercise:
+        case IDL::PartitionType::Exercise:
            return QStringLiteral("Exercise");
-        case PartitionType::Global:
+        case IDL::PartitionType::Global:
            return QStringLiteral("Global");
-        case PartitionType::Replay:
+        case IDL::PartitionType::Replay:
            return QStringLiteral("Replay");
+        default:
+            break;
    }

    return QStringLiteral("Invalid (%1)").arg(int(partitionType));
 }

-LtsSession::PartitionType LtsSessionDataDds::toPartitionType(IDL::PartitionType idlType)
-{
-    switch (idlType)
-    {
-        case IDL::PartitionType::Any: return PartitionType::Any;
-        case IDL::PartitionType::Exercise: return PartitionType::Exercise;
-        case IDL::PartitionType::Replay: return PartitionType::Replay;
-        case IDL::PartitionType::AllExercises: return PartitionType::AllExercises;
-        case IDL::PartitionType::Global: return PartitionType::Global;
-        default: return PartitionType::Invalid;
-    }
-}
-
 QString LtsSessionDataDds::toString() const
 {
    return QStringLiteral("(LtsSessionDataDds: id=%1, partitionId=%2, partitionType=%3(%4), exerciseId=%5)")
@@ -349,9 +314,9 @@ int LtsSessionDataDds::partitionId() const
    return m_ddsConnector ? m_ddsConnector->getPartitionId() : -1;
 }

-PartitionType LtsSessionDataDds::partitionType() const
+IDL::PartitionType LtsSessionDataDds::partitionType() const
 {
-    return m_ddsConnector ? toPartitionType(m_ddsConnector->getPartitionType()) : PartitionType::Global;
+    return m_ddsConnector ? m_ddsConnector->getPartitionType() : IDL::PartitionType::Global;
 }

 QStringList LtsSessionDataDds::qosFile() const
@@ -394,7 +359,7 @@ bool LtsSessionDataDds::initInternal()
    assert(m_dtcPartitionTime.get());

    m_dtcPartitionTime->setSubscriberCallback([this](const Core::PartitionTime& data, DataModification) {
-        m_curMSecSinceEpoch = data.timeStamp();
+        m_curMSecSinceEpoch = data.timeStamp;
        emit partitionTimeChangedInternal();
    });
    connect(this, &LtsSessionDataDds::partitionTimeChangedInternal, this,
@@ -38,12 +38,12 @@ struct DdsConnectionParams

  DdsConnectionParams() = default;
  explicit DdsConnectionParams(const Core::ReplayPartition &rp)
-    : domainId(rp.domainId())
-    , partitionId(rp.id())
-    , exerciseId(rp.exerciseId())
+    : domainId(rp.domainId)
+    , partitionId(rp.id)
+    , exerciseId(rp.exerciseId)
    , partitionType(IDL::PartitionType::Replay)
  {
-    setTcpConnectionUrl(rp.tcpConnectionUrl());
+    setTcpConnectionUrl(rp.tcpConnectionUrl);
  }

  bool isValid() const { return domainId >= 0 && partitionType != IDL::PartitionType::Any; }
@@ -1,11 +1,96 @@
 #include "lts_session_lock_handler.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>

 #include <QtCore/QDebug>

 namespace LtsSession
 {

-// STUB implementations - RTI DDS not available
-// All methods are stubbed since RTI Connext DDS is not available
+// STUB implementations - RTI Connext DDS not available.
+// The topic-lock feature depends on the RTI DDS backend (Core::Interface::Ftc),
+// which is an optional dependency not present in this build. These definitions
+// exist so that LtsSession links; the moc-generated qt_metacall references every
+// slot, so each slot needs a body. Semantics reflect an unavailable backend:
+// init reports failure (the caller logs a warning and skips wiring the handler)
+// and the handler is never locked.
+
+TopicLockHandler::TopicLockHandler()
+  : m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("LtsSession.TopicLockHandler"))
+{
+}
+
+TopicLockHandler::~TopicLockHandler() {}
+
+bool TopicLockHandler::init(const std::shared_ptr<Core::Interface::Ftc> &coreFtc, int exerciseId)
+{
+  Q_UNUSED(coreFtc);
+  Q_UNUSED(exerciseId);
+  return false; // RTI DDS backend unavailable
+}
+
+void TopicLockHandler::slotTryLock(const LtsWidgets::TopicInfo &topicInfo)
+{
+  Q_UNUSED(topicInfo);
+}
+
+bool TopicLockHandler::slotUnlock()
+{
+  return true; // nothing is locked (no DDS backend)
+}
+
+void TopicLockHandler::slotFinalize() {}
+
+bool TopicLockHandler::lock()
+{
+  return false; // no DDS backend to lock against
+}
+
+bool TopicLockHandler::unlock()
+{
+  return true; // nothing to unlock
+}
+
+std::string TopicLockHandler::objStateAsString() const
+{
+  return "stub (RTI DDS not available)";
+}
+
+
+TopicLockHanderData::TopicLockHanderData() {}
+
+TopicLockHanderData::~TopicLockHanderData() {}
+
+void TopicLockHanderData::init(const std::shared_ptr<Core::Interface::Ftc> &coreFtc, int exerciseId)
+{
+  Q_UNUSED(coreFtc);
+  Q_UNUSED(exerciseId);
+}
+
+void TopicLockHanderData::unlock() {}
+
+void TopicLockHanderData::slotTryLock(const LtsWidgets::TopicInfo &topicInfo)
+{
+  Q_UNUSED(topicInfo);
+}
+
+bool TopicLockHanderData::isLocked() const
+{
+  return false; // no DDS backend: never locked
+}
+
+LtsWidgets::TopicInfo TopicLockHanderData::getTopicInfo() const
+{
+  return LtsWidgets::TopicInfo();
+}
+
+void TopicLockHanderData::slotLock(const QString &lockedBy)
+{
+  m_lockedBy = lockedBy;
+}
+
+void TopicLockHanderData::slotUnlock()
+{
+  m_lockedBy.clear();
+}

 } // namespace LtsSession
@@ -89,7 +89,6 @@ void populateModel(LtsTimeline::TimelineModel* model)

    try
    {
-        const TestItem& testItem = dynamic_cast<const TestItem&>(model->item(5));
    }
    catch (const std::exception& ex)
    {
@@ -109,6 +108,7 @@ void populateModel(LtsTimeline::TimelineModel* model)
 #define unsorted false
        QVector<int> x;
        bool y;
+        (void)y;

        x = model->itemIdsBetween(now + 60'000 + 1, now + 150'000 - 1, non_strict, recursive);

@@ -51,7 +51,10 @@ Track& TimelineModel::track(int id) noexcept(false)
    {
        if (id == m_rootTrack.id())
            return m_rootTrack;
+        #pragma GCC diagnostic push
+        #pragma GCC diagnostic ignored "-Wdeprecated-declarations"  // model facade delegates to the deprecated root Track lookup
        return m_rootTrack.track(id);
+        #pragma GCC diagnostic pop
    }

    auto it = m_trackCache.find(id);
@@ -68,7 +71,10 @@ const Track& TimelineModel::track(int id) const noexcept(false)
    {
        if (id == m_rootTrack.id())
            return m_rootTrack;
+        #pragma GCC diagnostic push
+        #pragma GCC diagnostic ignored "-Wdeprecated-declarations"  // model facade delegates to the deprecated root Track lookup
        return m_rootTrack.track(id);
+        #pragma GCC diagnostic pop
    }

    std::map<int, Track*>::const_iterator it = m_trackCache.find(id);
@@ -82,7 +88,10 @@ const Track& TimelineModel::track(int id) const noexcept(false)
 Item& TimelineModel::item(int id) noexcept(false)
 {
    if (!m_itemCaching)
+        #pragma GCC diagnostic push
+        #pragma GCC diagnostic ignored "-Wdeprecated-declarations"  // model facade delegates to the deprecated root Track lookup
        return m_rootTrack.item(id);
+        #pragma GCC diagnostic pop

    auto it = m_itemCache.find(id);

@@ -95,7 +104,10 @@ Item& TimelineModel::item(int id) noexcept(false)
 const Item& TimelineModel::item(int id) const noexcept(false)
 {
    if (!m_itemCaching)
+        #pragma GCC diagnostic push
+        #pragma GCC diagnostic ignored "-Wdeprecated-declarations"  // model facade delegates to the deprecated root Track lookup
        return m_rootTrack.item(id);
+        #pragma GCC diagnostic pop

    decltype(m_itemCache)::const_iterator it = m_itemCache.find(id);

@@ -132,7 +144,10 @@ bool TimelineModel::isItemsBetween(qint64 start, qint64 end, const QVector<int>&
 const QVector<int> TimelineModel::copyItemIdsBetween(qint64 start, qint64 end, bool strict, bool complete,
                                                     bool sorted) const
 {
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wdeprecated-declarations"  // model facade delegates to the deprecated root Track lookup
    return m_rootTrack.copyItemIdsBetween(start, end, strict, complete, true, sorted);
+    #pragma GCC diagnostic pop
 }

 bool TimelineModel::isItemsBetween(qint64 start, qint64 end, int ignoreId, bool strict, bool complete,
@@ -45,9 +45,9 @@ void TimelineViewDragHandler::dragMoveEvent(QDragMoveEvent* e)
    if (!e->mimeData()->hasFormat(Item::mimetype))
        return;

-    m_dragPos = e->pos();
+    m_dragPos = e->position().toPoint();
    m_view->m_header->setHoverPosition(m_dragPos.x());
-    e->setAccepted(canDragItemsTo(e->pos()));
+    e->setAccepted(canDragItemsTo(e->position().toPoint()));
    m_view->viewport()->update();
 }

@@ -67,7 +67,7 @@ void TimelineViewDragHandler::dropEvent(QDropEvent* e)
    if (!e->mimeData()->hasFormat(Item::mimetype))
        return;

-    if (!canDragItemsTo(e->pos()))
+    if (!canDragItemsTo(e->position().toPoint()))
    {
        clear();
        e->acceptProposedAction();
@@ -22,8 +22,8 @@ namespace LtsTimeline

 TimelineWidget::TimelineWidget(QWidget *parent) 
  : QWidget(parent)
-  , m_ui(new Ui::Timeline)
  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("Timeline.TimelineWidget"))
+  , m_ui(new Ui::Timeline)
 {
    m_ui->setupUi(this);
    m_ui->debugWidget->hide();
@@ -20,7 +20,10 @@ const Track& Track::track(int id) const noexcept(false)
    {
        try
        {
+            #pragma GCC diagnostic push
+            #pragma GCC diagnostic ignored "-Wdeprecated-declarations"  // self-recursive lookup: recurses via the deprecated public Track API
            return track->track(id);
+            #pragma GCC diagnostic pop
        }
        catch (...)
        {
@@ -131,6 +134,7 @@ void Track::removeCopyItem(int itemId) noexcept(false)
 const QVector<int> Track::copyItemIdsBetween(qint64 start, qint64 end, bool strict, bool complete, bool recursive,
                                             bool sorted, qint64 minimumDuration) const
 {
+    Q_UNUSED(minimumDuration);
    auto itemPtrRefs = _copyItems();

    if (recursive)
@@ -153,7 +157,10 @@ const QVector<int> Track::copyItemIdsBetween(qint64 start, qint64 end, bool stri
        sort(itemPtrRefs);
    }

+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wdeprecated-declarations"  // internal call to the deprecated transformItemPtrsToIds helper
    return transformItemPtrsToIds(itemPtrRefs);
+    #pragma GCC diagnostic pop
 }

 const QVector<int> Track::itemIdsBetween(qint64 start, qint64 end, bool strict, bool complete, bool recursive,
@@ -171,7 +178,10 @@ const QVector<int> Track::itemIdsBetween(qint64 start, qint64 end, bool strict,

        sort(itemPtrRefs);

+        #pragma GCC diagnostic push
+        #pragma GCC diagnostic ignored "-Wdeprecated-declarations"  // internal call to the deprecated transformItemPtrsToIds helper
        return transformItemPtrsToIds(itemPtrRefs);
+        #pragma GCC diagnostic pop
    }

    QVector<int> itemIds;
@@ -209,7 +219,10 @@ bool Track::isItemsBetween(qint64 start, qint64 end, const QVector<int>& ignoreI

    for (const int itemId : std::as_const(m_copyItemIds))
    {
+        #pragma GCC diagnostic push
+        #pragma GCC diagnostic ignored "-Wdeprecated-declarations"  // internal lookup via the deprecated Track::item
        const Item& i = item(itemId);
+        #pragma GCC diagnostic pop
        if (!ignoreIds.contains(i.id()))
            if (isItemBetween(i, start, end, strict, complete, minimumDuration))
                return true;
@@ -304,7 +317,10 @@ ItemPtrNCVRefs Track::_itemsNCV(bool recursive)

 const QVector<int> Track::_itemIds(bool recursive) const
 {
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wdeprecated-declarations"  // internal call to the deprecated transformItemPtrsToIds helper
    QVector<int> itemIds(transformItemPtrsToIds(m_items));
+    #pragma GCC diagnostic pop

    if (!recursive)
        return itemIds;
@@ -363,19 +379,28 @@ QVector<int> Track::itemIds(bool recursive, bool sorted) const
    if (sorted)
    {
        if (!recursive)
+            #pragma GCC diagnostic push
+            #pragma GCC diagnostic ignored "-Wdeprecated-declarations"  // internal call to the deprecated transformItemPtrsToIds helper
            return transformItemPtrsToIds(m_items);
+            #pragma GCC diagnostic pop

        ItemPtrRefs is(_items(true));

        sort(is);

+        #pragma GCC diagnostic push
+        #pragma GCC diagnostic ignored "-Wdeprecated-declarations"  // internal call to the deprecated transformItemPtrsToIds helper
        return transformItemPtrsToIds(is);
+        #pragma GCC diagnostic pop
    }

    QVector<int> itemIds;
    itemIds.reserve(m_items.size());

+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wdeprecated-declarations"  // internal call to the deprecated transformItemPtrsToIds helper
    itemIds += transformItemPtrsToIds(m_items);
+    #pragma GCC diagnostic pop

    if (!recursive)
        return itemIds;
@@ -448,7 +473,10 @@ Track& Track::track(int id) noexcept(false)
    {
        try
        {
+            #pragma GCC diagnostic push
+            #pragma GCC diagnostic ignored "-Wdeprecated-declarations"  // self-recursive lookup: recurses via the deprecated public Track API
            return track->track(id);
+            #pragma GCC diagnostic pop
        }
        catch (...)
        {
@@ -495,7 +523,10 @@ Item& Track::item(int id) noexcept(false)
    {
        try
        {
+            #pragma GCC diagnostic push
+            #pragma GCC diagnostic ignored "-Wdeprecated-declarations"  // self-recursive lookup: recurses via the deprecated public Track API
            return track->item(id);
+            #pragma GCC diagnostic pop
        }
        catch (...)
        {
@@ -519,7 +550,10 @@ const Item& Track::item(int id) const noexcept(false)
    {
        try
        {
+            #pragma GCC diagnostic push
+            #pragma GCC diagnostic ignored "-Wdeprecated-declarations"  // self-recursive lookup: recurses via the deprecated public Track API
            return track->item(id);
+            #pragma GCC diagnostic pop
        }
        catch (...)
        {
@@ -1,6 +1,7 @@


 #include "Event.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>

 #include <LtsSession/lts_session.h>
 #include <QtGui/QPainter>
@@ -1,6 +1,7 @@


 #include "TimelineHeaderView.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>

 #include "TimelineWidget.h"

@@ -935,8 +935,8 @@ void LtsUtilsTest::test_jsonArray()

    QVERIFY_EXCEPTION_THROWN(array.at<std::string>(0), JsonTypeError);

-    QVERIFY_EXCEPTION_THROWN(array.contains<int>(-1), JsonRangeError);
-    QVERIFY_EXCEPTION_THROWN(array.contains<int>(4), JsonRangeError);
+    QVERIFY_EXCEPTION_THROWN((void)array.contains<int>(-1), JsonRangeError);
+    QVERIFY_EXCEPTION_THROWN((void)array.contains<int>(4), JsonRangeError);
    QVERIFY_EXCEPTION_THROWN(array.at<int>(-1), JsonRangeError);
    QVERIFY_EXCEPTION_THROWN(array.at<int>(4), JsonRangeError);

@@ -223,12 +223,10 @@ template <typename T> bool inline get1Byte(const QByteArray& baData, size_t& pos
    if (size_t(baData.size()) < pos + 1)
        return false;

-    const char* data = baData.data() + pos;
-
    if (std::numeric_limits<T>::is_signed)
-        out = (T)(data[0]);
+        out = (T)(baData.at(pos));
    else
-        out = (T)(data[0] & 0xFF);
+        out = (T)(baData.at(pos) & 0xFF);

    pos += 1;

@@ -4,36 +4,6 @@

 #include <QtCore/QDataStream>

-using namespace LtsUtils;
-
-double QPoint3D::distanceToLine(const QPoint3D& point, const QPoint3D& direction) const
-{
-    if (direction.isNull())
-        return (*this - point).length();
-    QPoint3D p = point + dotProduct(*this - point, direction) * direction;
-    return (*this - p).length();
-}
-
-double QPoint3D::distanceToPlane(const QPoint3D& plane, const QPoint3D& normal) const
-{
-    return dotProduct(*this - plane, normal);
-}
-
-double QPoint3D::distanceToPlane(const QPoint3D& plane1, const QPoint3D& plane2, const QPoint3D& plane3) const
-{
-    QPoint3D n = normal(plane2 - plane1, plane3 - plane1);
-    return dotProduct(*this - plane1, n);
-}
-
-double QPoint3D::distanceToPoint(const QPoint3D& point) const
-{
-    return (*this - point).length();
-}
-
-// The header declares these operators inside namespace LtsUtils; they must
-// be defined there too (a `using` directive does not place definitions
-// into a namespace). Qt6's QDataStreamOperatorForType metatype machinery
-// references the LtsUtils-scoped symbols explicitly.
 namespace LtsUtils
 {

@@ -6,6 +6,7 @@

 #include <QtCore/qglobal.h>
 #include <QtCore/qpoint.h>
+#include <QtCore/qdatastream.h>
 #include <cmath>
 #include <sstream>

@@ -17,8 +18,8 @@ class QPoint3D
  public:
    enum class Axis { X, Y, Z };

-    Q_DECL_CONSTEXPR QPoint3D() = default;
-    Q_DECL_CONSTEXPR QPoint3D(double xpos, double ypos, double zpos);
+    constexpr QPoint3D() = default;
+    constexpr QPoint3D(double xpos, double ypos, double zpos);

    template <typename T> explicit QPoint3D(const T& data) : xp(data.offsetX()), yp(data.offsetY()), zp(data.offsetZ())
    {
@@ -26,18 +27,18 @@ class QPoint3D

    inline bool isNull() const;

-    Q_DECL_CONSTEXPR inline double x() const;
-    Q_DECL_CONSTEXPR inline double y() const;
-    Q_DECL_CONSTEXPR inline double z() const;
-    Q_DECL_RELAXED_CONSTEXPR inline void setX(double xpos);
-    Q_DECL_RELAXED_CONSTEXPR inline void setY(double ypos);
-    Q_DECL_RELAXED_CONSTEXPR inline void setZ(double zpos);
+    constexpr inline double x() const;
+    constexpr inline double y() const;
+    constexpr inline double z() const;
+    constexpr inline void setX(double xpos);
+    constexpr inline void setY(double ypos);
+    constexpr inline void setZ(double zpos);

-    Q_DECL_RELAXED_CONSTEXPR inline double& rx();
-    Q_DECL_RELAXED_CONSTEXPR inline double& ry();
-    Q_DECL_RELAXED_CONSTEXPR inline double& rz();
+    constexpr inline double& rx();
+    constexpr inline double& ry();
+    constexpr inline double& rz();

-    Q_DECL_CONSTEXPR inline QPointF toPointF() const;
+    constexpr inline QPointF toPointF() const;

    static QPoint3D fromQPointF(const QPointF& p)
    {
@@ -115,40 +116,56 @@ class QPoint3D
        return p;
    }

-    inline double distanceToLine(const QPoint3D& point, const QPoint3D& direction) const;
-    inline double distanceToPlane(const QPoint3D& plane, const QPoint3D& normal) const;
-    inline double distanceToPlane(const QPoint3D& plane1, const QPoint3D& plane2, const QPoint3D& plane3) const;
-    inline double distanceToPoint(const QPoint3D& point) const;
+    inline double distanceToLine(const QPoint3D& point, const QPoint3D& direction) const
+    {
+        if (direction.isNull())
+            return (*this - point).length();
+        QPoint3D p = point + dotProduct(*this - point, direction) * direction;
+        return (*this - p).length();
+    }
+    inline double distanceToPlane(const QPoint3D& plane, const QPoint3D& normal) const
+    {
+        return dotProduct(*this - plane, normal);
+    }
+    inline double distanceToPlane(const QPoint3D& plane1, const QPoint3D& plane2, const QPoint3D& plane3) const
+    {
+        QPoint3D n = normal(plane2 - plane1, plane3 - plane1);
+        return dotProduct(*this - plane1, n);
+    }
+    inline double distanceToPoint(const QPoint3D& point) const
+    {
+        return (*this - point).length();
+    }

-    friend Q_DECL_CONSTEXPR inline bool operator==(const QPoint3D& p1, const QPoint3D& p2);
-    friend Q_DECL_CONSTEXPR inline bool operator!=(const QPoint3D& p1, const QPoint3D& p2);
+    friend constexpr inline bool operator==(const QPoint3D& p1, const QPoint3D& p2);
+    friend constexpr inline bool operator!=(const QPoint3D& p1, const QPoint3D& p2);

-    friend Q_DECL_CONSTEXPR inline QPoint3D operator+(const QPoint3D& p1, const QPoint3D& p2)
+    friend constexpr inline QPoint3D operator+(const QPoint3D& p1, const QPoint3D& p2)
    {
        return QPoint3D(p1.xp + p2.xp, p1.yp + p2.yp, p1.zp + p2.zp);
    }

-    friend Q_DECL_CONSTEXPR inline QPoint3D operator-(const QPoint3D& p1, const QPoint3D& p2)
+    friend constexpr inline QPoint3D operator-(const QPoint3D& p1, const QPoint3D& p2)
    {
        return QPoint3D(p1.xp - p2.xp, p1.yp - p2.yp, p1.zp - p2.zp);
    }

-    friend Q_DECL_CONSTEXPR inline QPoint3D operator*(const QPoint3D& p1, double factor)
+    friend constexpr inline QPoint3D operator*(const QPoint3D& p1, double factor)
    {
        return QPoint3D(p1.xp * factor, p1.yp * factor, p1.zp * factor);
    }

-    friend Q_DECL_CONSTEXPR inline QPoint3D operator*(double factor, const QPoint3D& p1)
+    friend constexpr inline QPoint3D operator*(double factor, const QPoint3D& p1)
    {
        return QPoint3D(p1.xp * factor, p1.yp * factor, p1.zp * factor);
    }

-    friend Q_DECL_CONSTEXPR inline QPoint3D operator/(const QPoint3D& p1, double factor)
+    friend constexpr inline QPoint3D operator/(const QPoint3D& p1, double factor)
    {
        return QPoint3D(p1.xp / factor, p1.yp / factor, p1.zp / factor);
    }

-    Q_DECL_RELAXED_CONSTEXPR inline QPoint3D& operator+=(const QPoint3D& o)
+    constexpr inline QPoint3D& operator+=(const QPoint3D& o)
    {
        xp += o.xp;
        yp += o.yp;
@@ -156,7 +173,7 @@ class QPoint3D
        return *this;
    }

-    Q_DECL_RELAXED_CONSTEXPR inline QPoint3D& operator-=(const QPoint3D& o)
+    constexpr inline QPoint3D& operator-=(const QPoint3D& o)
    {
        xp -= o.xp;
        yp -= o.yp;
@@ -164,7 +181,7 @@ class QPoint3D
        return *this;
    }

-    Q_DECL_RELAXED_CONSTEXPR inline QPoint3D& operator*=(double factor)
+    constexpr inline QPoint3D& operator*=(double factor)
    {
        xp *= factor;
        yp *= factor;
@@ -172,7 +189,7 @@ class QPoint3D
        return *this;
    }

-    Q_DECL_RELAXED_CONSTEXPR inline QPoint3D& operator/=(double divisor)
+    constexpr inline QPoint3D& operator/=(double divisor)
    {
        xp /= divisor;
        yp /= divisor;
@@ -180,12 +197,12 @@ class QPoint3D
        return *this;
    }

-    Q_DECL_CONSTEXPR static inline double dotProduct(const QPoint3D& v1, const QPoint3D& v2)
+    constexpr static inline double dotProduct(const QPoint3D& v1, const QPoint3D& v2)
    {
        return v1.xp * v2.xp + v1.yp * v2.yp + v1.zp * v2.zp;
    }

-    Q_DECL_CONSTEXPR static inline QPoint3D crossProduct(const QPoint3D& v1, const QPoint3D& v2)
+    constexpr static inline QPoint3D crossProduct(const QPoint3D& v1, const QPoint3D& v2)
    {
        return QPoint3D(v1.yp * v2.zp - v1.zp * v2.yp, v1.zp * v2.xp - v1.xp * v2.zp, v1.xp * v2.yp - v1.yp * v2.xp);
    }
@@ -200,7 +217,10 @@ class QPoint3D
        return crossProduct((v2 - v1), (v3 - v1)).normalized();
    }

-    Q_DECL_CONSTEXPR friend inline bool qFuzzyCompare(const QPoint3D& v1, const QPoint3D& v2);
+    friend inline bool qFuzzyCompare(const QPoint3D& v1, const QPoint3D& v2)
+    {
+        return ::qFuzzyCompare(v1.xp, v2.xp) && ::qFuzzyCompare(v1.yp, v2.yp) && ::qFuzzyCompare(v1.zp, v2.zp);
+    }

  private:
    double xp = 0;
@@ -208,81 +228,76 @@ class QPoint3D
    double zp = 0;
 };

-LTSUTILSCORE_EXPORT QDataStream& operator<<(QDataStream& s, const QPoint3D& p);
-LTSUTILSCORE_EXPORT QDataStream& operator>>(QDataStream& s, QPoint3D& p);
+// QDataStream& operator<<(QDataStream& s, const QPoint3D& p);
+// QDataStream& operator>>(QDataStream& s, QPoint3D& p);

-Q_DECL_CONSTEXPR inline QPoint3D::QPoint3D(double xpos, double ypos, double zpos) : xp(xpos), yp(ypos), zp(zpos) {}
+constexpr inline QPoint3D::QPoint3D(double xpos, double ypos, double zpos) : xp(xpos), yp(ypos), zp(zpos) {}

 inline bool QPoint3D::isNull() const
 {
    return qIsNull(xp) && qIsNull(yp) && qIsNull(zp);
 }

-Q_DECL_CONSTEXPR inline double QPoint3D::x() const
+constexpr inline double QPoint3D::x() const
 {
    return xp;
 }

-Q_DECL_CONSTEXPR inline double QPoint3D::y() const
+constexpr inline double QPoint3D::y() const
 {
    return yp;
 }

-Q_DECL_CONSTEXPR inline double QPoint3D::z() const
+constexpr inline double QPoint3D::z() const
 {
    return zp;
 }

-Q_DECL_RELAXED_CONSTEXPR inline void QPoint3D::setX(double xpos)
+constexpr inline void QPoint3D::setX(double xpos)
 {
    xp = xpos;
 }

-Q_DECL_RELAXED_CONSTEXPR inline void QPoint3D::setY(double ypos)
+constexpr inline void QPoint3D::setY(double ypos)
 {
    yp = ypos;
 }

-Q_DECL_RELAXED_CONSTEXPR inline void QPoint3D::setZ(double zpos)
+constexpr inline void QPoint3D::setZ(double zpos)
 {
    zp = zpos;
 }

-Q_DECL_RELAXED_CONSTEXPR inline double& QPoint3D::rx()
+constexpr inline double& QPoint3D::rx()
 {
    return xp;
 }

-Q_DECL_RELAXED_CONSTEXPR inline double& QPoint3D::ry()
+constexpr inline double& QPoint3D::ry()
 {
    return yp;
 }

-Q_DECL_RELAXED_CONSTEXPR inline double& QPoint3D::rz()
+constexpr inline double& QPoint3D::rz()
 {
    return zp;
 }

-Q_DECL_CONSTEXPR inline QPointF QPoint3D::toPointF() const
+constexpr inline QPointF QPoint3D::toPointF() const
 {
    return QPointF(xp, yp);
 }

-Q_DECL_CONSTEXPR inline bool operator==(const QPoint3D& p1, const QPoint3D& p2)
+constexpr inline bool operator==(const QPoint3D& p1, const QPoint3D& p2)
 {
    return p1.xp == p2.xp && p1.yp == p2.yp && p1.zp == p2.zp;
 }

-Q_DECL_CONSTEXPR inline bool operator!=(const QPoint3D& p1, const QPoint3D& p2)
+constexpr inline bool operator!=(const QPoint3D& p1, const QPoint3D& p2)
 {
    return p1.xp != p2.xp || p1.yp != p2.yp || p1.zp != p2.zp;
 }

-Q_DECL_CONSTEXPR inline bool qFuzzyCompare(const QPoint3D& v1, const QPoint3D& v2)
-{
-    return ::qFuzzyCompare(v1.xp, v2.xp) && ::qFuzzyCompare(v1.yp, v2.yp) && ::qFuzzyCompare(v1.zp, v2.zp);
-}
-
 inline std::ostream& operator<<(std::ostream& stream, const QPoint3D& pos)
 {
    stream << "(" << pos.x() << "," << pos.y() << "," << pos.z() << ")";
@@ -291,4 +306,4 @@ inline std::ostream& operator<<(std::ostream& stream, const QPoint3D& pos)

 } // namespace LtsUtils

-Q_DECLARE_TYPEINFO(LtsUtils::QPoint3D, Q_MOVABLE_TYPE);
+// Q_DECLARE_METATYPE(LtsUtils::QPoint3D)
@@ -9,7 +9,7 @@ namespace LtsUtils

 inline bool lessThan(const QVariant& var1, const QVariant& var2)
 {
-    if (var1.canConvert(QMetaType::QString) && var2.canConvert(QMetaType::QString))
+    if (var1.canConvert<QString>() && var2.canConvert<QString>())
    {
        QString str1(var1.toString());
        QString str2(var2.toString());
@@ -28,7 +28,7 @@ inline bool lessThan(const QVariant& var1, const QVariant& var2)

        return d1 < d2;
    }
-    else if (var1.canConvert(QMetaType::Double) && var2.canConvert(QMetaType::Double))
+    else if (var1.canConvert<double>() && var2.canConvert<double>())
        return var1.toDouble() < var2.toDouble();

    return false;
@@ -53,6 +53,20 @@ NGL_TARGET_COMPILE_DEFINITIONS(LtsUtilsGuiDds
    REQUEST_HELPER_WITH_GUI
 )

+# The dds_vector_to_pixmap free functions (iconFromSvg / pixmapFromIcon / ...) are
+# declared with LTSUTILSCORE_EXPORT, but this TU's include
+# <LtsUtils/LtsUtilsCore/ltsutilscore_export.h> resolves to the SOURCE-tree header,
+# where the macro expands to Q_DECL_IMPORT (empty on Linux) because
+# MAKE_LTSUTILSCORE_LIB is only defined when building LtsUtilsCore itself. Under the
+# project-wide -fvisibility=hidden they therefore compile as hidden symbols and, with
+# USE_IPO=ON, LTO drops them from the DSO entirely (they are unreferenced inside this
+# lib), breaking every consumer that links them (LtsMultiMonitor, LtsSession, ...).
+# Legacy exported them because its include <LtsUtilsCore/ltsutilscore_export.h>
+# resolved to the GENERATED export header (visibility("default")). Restore that
+# default visibility for this target only (same fix shape as the PluginInterfaces
+# visibility preset); behavior-neutral.
+set_target_properties(LtsUtilsGuiDds PROPERTIES CXX_VISIBILITY_PRESET default)
+

 NGL_ADD_LIBRARY2(AAR HLA  SV LtsUtilsDds SHARED request_helper.cpp request_helper.h)
 NGL_TARGET_INCLUDE_DIRECTORIES(LtsUtilsDds
@@ -49,7 +49,7 @@ WebSocketHelper::WebSocketHelper(AbstractClientMessageFactory* messageFactory, L
    connect(m_socket, &QWebSocket::textFrameReceived, this, &WebSocketHelper::dataReceived);
    connect(m_socket, &QWebSocket::connected, this, &WebSocketHelper::onConnected);
    connect(m_socket, &QWebSocket::disconnected, this, &WebSocketHelper::onDisconnected);
-    connect(m_socket, QOverload<QAbstractSocket::SocketError>::of(&QWebSocket::error), this, &WebSocketHelper::error);
+    connect(m_socket, &QWebSocket::errorOccurred, this, &WebSocketHelper::error);
 }

 WebSocketHelper::~WebSocketHelper()
@@ -150,6 +150,8 @@ NGL_WRAP_UI(ltswidgets_SRCS
 NGL_ADD_BIG_RESOURCES(ltswidgets_SRCS resources/lts_resources.qrc)
 NGL_ADD_LIBRARY(WS TOOLSWS TOOLSSV LtsWidgets SHARED ${ltswidgets_SRCS})

+# ui_requirement.h is not a UI file but regular C++ code - disable AUTOUIC
+set_target_properties(LtsWidgets PROPERTIES AUTOUIC OFF)

 NGL_TARGET_INCLUDE_DIRECTORIES(LtsWidgets
  PUBLIC
@@ -159,9 +161,10 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsWidgets
 NGL_TARGET_LINK_LIBRARIES(LtsWidgets
  PRIVATE
    Qt6::Network # for QHostInfo - for portability
-    Qt6::Svg
+    $<IF:$<TARGET_EXISTS:Qt6::Svg>,Qt6::Svg,>
    ngltools
    ngltranslator
+    NGLLogger
    TabBarTabStyle
    LtsSessionData
    LtsUtilsSettings
@@ -180,6 +183,13 @@ NGL_INSTALL_TARGET(LtsWidgets)
 SET(ltswidgetsplugin_SRCS ltswidgetsplugin.cpp ltswidgetsplugin.json)
 NGL_ADD_LIBRARY(WS ltswidgetsplugin MODULE ${ltswidgetsplugin_SRCS})
 NGL_TARGET_LINK_LIBRARIES(ltswidgetsplugin LtsWidgets ltsCoordWidget LtsDataView LtsFileDialog LtsReportDisplay svcFlmCommon)
+# ltswidgetsplugin.cpp unconditionally includes <LtsReportDisplay/lts_report_display_widget.h>,
+# which pulls KDReports -> #include <QPrinter>. In Qt6 that forwarding header lives in
+# <QtInc>/QtPrintSupport. With BUILD_CODIFICATION=OFF the LtsReportDisplay->KDReports
+# include chain is not built, so expose the QtPrintSupport module dir directly.
+if(DEFINED QT6_INC_DIR AND EXISTS "${QT6_INC_DIR}/QtPrintSupport")
+  NGL_TARGET_INCLUDE_DIRECTORIES(ltswidgetsplugin PRIVATE "${QT6_INC_DIR}/QtPrintSupport")
+endif()
 NGL_SET_TARGET_PROPERTIES(ltswidgetsplugin PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/designer)
 NGL_INSTALL_TARGET(ltswidgetsplugin DESTINATION lib/designer COMPONENT Devel)

@@ -49,6 +49,7 @@ void LtsAbstractSequenceWidget::getValue(QWidget *data,
    return;

  data = findChild<QWidget *>(findObjectName);
+  Q_UNUSED(data);
 }

 void LtsAbstractSequenceWidget::setMemberCount(int count)
@@ -39,7 +39,9 @@
 #include <QtWidgets/QPushButton>
 #include <QtWidgets/QScrollArea>
 #include <QScroller>
-#include <QSvgRenderer>
+#ifdef QT_SVG_LIB
+#include <QtSvg/QSvgRenderer>
+#endif
 #include <QtCore/QTimer>
 #include <QtWidgets/QToolButton>
 #include <QtCore/QPropertyAnimation>
@@ -399,6 +401,7 @@ void LtsBaseLayoutWidget::showEvent(QShowEvent *event)
  {
    const QSize s(QSize(rendererSizeHint.height(), rendererSizeHint.height()) * dpr);
    // RDE SPLITTER LEFT
+#ifdef QT_SVG_LIB
    QSvgRenderer svgRenderer;
    QPixmap pixmap(s);
    pixmap.fill(Qt::transparent);
@@ -410,6 +413,9 @@ void LtsBaseLayoutWidget::showEvent(QShowEvent *event)

    pixmap.setDevicePixelRatio(dpr);
    m_ui->lbRdeSplitterLeft->setPixmap(pixmap);
+#else
+    qWarning() << "QSvgRenderer not available - skipping SVG rendering for splitter";
+#endif
  }

  {
@@ -59,7 +59,7 @@ public:
    {
      const T &entry = LtsAbstractTableModel<T>::m_vecData.at(row);
      if (entry.first)
-        ids << entry.second.id();
+        ids << entry.second.id;
    }

    return ids;
@@ -73,7 +73,7 @@ public:
    {
      const T &entry = LtsAbstractTableModel<T>::m_vecData.at(row);
      if (!entry.first)
-        ids << entry.second.id();
+        ids << entry.second.id;
    }

    return ids;
@@ -84,7 +84,7 @@ public:
    for (int row = 0; row < LtsAbstractTableModel<T>::rowCount(); ++row)
    {
      T &entry = LtsAbstractTableModel<T>::m_vecData[row];
-      bool bContains = vecCheckedIds.contains(entry.second.id());
+      bool bContains = vecCheckedIds.contains(entry.second.id);
      if (entry.first != bContains)
      {
        entry.first = bContains;
@@ -22,6 +22,7 @@
 #include <QtWidgets/QCheckBox>
 #include <QtWidgets/QCompleter>
 #include <QtCore/QDateTime>
+#include <QtCore/QTimeZone>
 #include <QtWidgets/QGridLayout>
 #include <QtWidgets/QHBoxLayout>
 #include <QtGui/QKeyEvent>
@@ -248,7 +249,7 @@ int getItemValue(QSpinBox *spinBox)
 LtsDateTimeEdit::LtsDateTimeEdit(QWidget *parent, bool withNowButton, bool checkable)
  : QWidget(parent)
 //  , m_uiLe(new Ui::LtsDateTimeEditLe)
-  , m_scFixed(new QShortcut(QKeySequence(Qt::ShiftModifier + Qt::Key_F2), this, SLOT(setFixedDateTime()), nullptr, Qt::WidgetWithChildrenShortcut))
+  , m_scFixed(new QShortcut(QKeySequence(Qt::ShiftModifier | Qt::Key_F2), this, SLOT(setFixedDateTime()), nullptr, Qt::WidgetWithChildrenShortcut))
  , m_scOffset(new QShortcut(QKeySequence(Qt::Key_F2), this, SLOT(setOffsetDateTime()), nullptr, Qt::WidgetWithChildrenShortcut))
  , m_checkable(checkable) // see below
  , m_withNowButton(withNowButton) // see below
@@ -551,7 +552,7 @@ bool LtsDateTimeEdit::setMsecsSinceEpoch(qint64 msec, bool setToNearestPossible)
  m_curTimeMSec = msec;

  const qint64 offsetTimeZoneMsec = getTimezoneAsSecs() * 1000;
-  const QDateTime datetime(QDateTime::fromMSecsSinceEpoch(m_curTimeMSec + offsetTimeZoneMsec, Qt::UTC));
+  const QDateTime datetime(QDateTime::fromMSecsSinceEpoch(m_curTimeMSec + offsetTimeZoneMsec, QTimeZone(0)));
  const QDate date(datetime.date());
  const QTime time(datetime.time());

@@ -940,7 +941,7 @@ bool LtsDateTimeEdit::isDataAcceptable()
    return false;
  }

-  qint64 msec = QDateTime(QDate(getYear(), getMonth(), getDay()), QTime(getHour(), getMinute(), getSecond()), Qt::UTC).toMSecsSinceEpoch();
+  qint64 msec = QDateTime(QDate(getYear(), getMonth(), getDay()), QTime(getHour(), getMinute(), getSecond()), QTimeZone(0)).toMSecsSinceEpoch();
  msec -= DTG::timezone2Secs(getTimezone()) * 1000LL;
  if (m_minTimeMSec > 0 && m_maxTimeMSec > 0 && m_minTimeMSec < m_maxTimeMSec)
  {
@@ -1539,7 +1540,7 @@ void LtsDateTimeEdit::onFocusOutDay()
    {
      if (m_getCurrentTimeCallback)
      {
-        const QDateTime dt(QDateTime::fromMSecsSinceEpoch(m_getCurrentTimeCallback(), Qt::UTC));
+        const QDateTime dt(QDateTime::fromMSecsSinceEpoch(m_getCurrentTimeCallback(), QTimeZone(0)));
        setDay(dt.date().day());
      }
    }
@@ -1571,7 +1572,7 @@ void LtsDateTimeEdit::onFocusOutHHMMSS()
    {
      if (m_getCurrentTimeCallback)
      {
-        const QDateTime dt(QDateTime::fromMSecsSinceEpoch(m_getCurrentTimeCallback(), Qt::UTC));
+        const QDateTime dt(QDateTime::fromMSecsSinceEpoch(m_getCurrentTimeCallback(), QTimeZone(0)));
        setHHMMSS(dt.time().hour(), dt.time().minute(), dt.time().second());
      }
    }
@@ -1632,7 +1633,7 @@ void LtsDateTimeEdit::onFocusOutMonth()
    {
      if (m_getCurrentTimeCallback)
      {
-        const QDateTime dt(QDateTime::fromMSecsSinceEpoch(m_getCurrentTimeCallback(), Qt::UTC));
+        const QDateTime dt(QDateTime::fromMSecsSinceEpoch(m_getCurrentTimeCallback(), QTimeZone(0)));
        setMonth(dt.date().month());
      }
    }
@@ -1671,7 +1672,7 @@ void LtsDateTimeEdit::onFocusOutYear()
    {
      if (m_getCurrentTimeCallback)
      {
-        const QDateTime dt(QDateTime::fromMSecsSinceEpoch(m_getCurrentTimeCallback(), Qt::UTC));
+        const QDateTime dt(QDateTime::fromMSecsSinceEpoch(m_getCurrentTimeCallback(), QTimeZone(0)));
        setYear(dt.date().year());
      }
    }
@@ -1768,7 +1769,7 @@ void LtsDateTimeEdit::onMonthWheelEvent(bool bForward, int cursorPos)
  if (!isMonthAcceptable())
    return;
  const int ofs = bForward ? 1 : -1;
-  const QDateTime dt(QDateTime::fromMSecsSinceEpoch(m_curTimeMSec, Qt::UTC).addMonths(ofs));
+  const QDateTime dt(QDateTime::fromMSecsSinceEpoch(m_curTimeMSec, QTimeZone(0)).addMonths(ofs));
  setMsecsSinceEpoch(dt.toMSecsSinceEpoch(), true);
  m_uiLe->leLongMonth->setCursorPosition(cursorPos);
  m_uiLe->leLongMonth->setSelection(0, 3);
@@ -1782,7 +1783,7 @@ void LtsDateTimeEdit::onYearWheelEvent(bool bForward, int cursorPos)
  if (!isYearAcceptable())
    return;
  const int ofs = bForward ? 1 : -1;
-  const QDateTime dt(QDateTime::fromMSecsSinceEpoch(m_curTimeMSec, Qt::UTC).addYears(ofs));
+  const QDateTime dt(QDateTime::fromMSecsSinceEpoch(m_curTimeMSec, QTimeZone(0)).addYears(ofs));
  setMsecsSinceEpoch(dt.toMSecsSinceEpoch(), true);
  m_uiLe->leLongYear->setCursorPosition(cursorPos);
  m_uiLe->leLongYear->setSelection(0, 2);
@@ -7,6 +7,7 @@
 */

 #include "lts_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "lts_progress_dialog_helper.h"
 #include "lts_message_dialog.h"
 #include "lts_dialog_helper.h"
@@ -389,7 +390,7 @@ void LtsDialog::addConnections(QWidget *widget)
  if (addChangesMadeSignal<QLineEdit>(widget, &QLineEdit::textChanged)) return;
  if (addChangesMadeSignal<QDateTimeEdit>(widget, &QDateTimeEdit::dateTimeChanged)) return;
  if (addChangesMadeSignal<QComboBox>(widget, &QComboBox::currentTextChanged)) return;
-  if (addChangesMadeSignal<QCheckBox>(widget, &QCheckBox::stateChanged)) return;
+  if (addChangesMadeSignal<QCheckBox>(widget, &QCheckBox::checkStateChanged)) return;
  if (addChangesMadeSignal<QSpinBox>(widget, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged))) return;
  if (addChangesMadeSignal<QDoubleSpinBox>(widget, static_cast<void (QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged))) return;
  if (addChangesMadeSignal<QSlider>(widget, &QSlider::valueChanged)) return;
@@ -327,7 +327,7 @@ protected:
   */
  void translate(T *ui, const S &data, const QString &custom, const QString &title) // same as 'void translate(T *ui, const S &data, const QString &title)', but for topics without the 'name' entry
  {
-    translate(ui, QString::fromUtf8(typeid(data).name()), data.id(), custom /* can be empty */, title);
+    translate(ui, QString::fromUtf8(typeid(data).name()), data.id, custom /* can be empty */, title);
  }


@@ -341,7 +341,7 @@ protected:
   */
  void translate(T *ui, const S &data, const QString &title)
  {
-    translate(ui, data, QString::fromStdString(data.name()), title);    // -> translate #5
+    translate(ui, data, QString::fromStdString(data.name), title);    // -> translate #5
  }


@@ -437,7 +437,7 @@ private:
    for (WidgetType *widget : children)
    {
      QVariant lastState = widget->property("lastReadOnlyState");
-      if (lastState.isValid() && !lastState.isNull() && lastState.canConvert(QMetaType::Bool))
+      if (lastState.isValid() && !lastState.isNull() && lastState.canConvert<bool>())
        widget->setReadOnly(lastState.toBool());
    }
  }
@@ -449,7 +449,7 @@ private:
    for (WidgetType *widget : children)
    {
      QVariant lastState = widget->property("lastEnabledState");
-      if (lastState.isValid() && !lastState.isNull() && lastState.canConvert(QMetaType::Bool))
+      if (lastState.isValid() && !lastState.isNull() && lastState.canConvert<bool>())
        widget->setEnabled(lastState.toBool());
    }
  }
@@ -119,6 +119,7 @@ void bt()
    }

    //qWarning() << "frame" << i << address << function << offset;
+    (void)offset;
  }

  free(symbols);
@@ -1,4 +1,5 @@
 #include "lts_msec_date_time_edit.h"
+#include <QTimeZone>


 namespace LtsWidgets
@@ -84,12 +85,12 @@ void LtsMSecDateTimeEdit::setTimezoneHoursOffset(int timezoneHoursOffset)
 void LtsMSecDateTimeEdit::setDateTime(const QDateTime &dateTime)
 {
  // TODO: doesn't make sense, as toMSecsSinceEpoch returns the *UTC version* of the dt, so the timespec stuff does nothing
-  setMsecsSinceEpoch(QDateTime::fromMSecsSinceEpoch(dateTime.toMSecsSinceEpoch(), Qt::TimeSpec::OffsetFromUTC, m_timezoneHoursOffset * 3600).toMSecsSinceEpoch());
+  setMsecsSinceEpoch(QDateTime::fromMSecsSinceEpoch(dateTime.toMSecsSinceEpoch(), QTimeZone(m_timezoneHoursOffset * 3600)).toMSecsSinceEpoch());
 }

 void LtsMSecDateTimeEdit::setMsecsSinceEpoch(qint64 msecs)
 {
-  QDateTimeEdit::setDateTime(QDateTime::fromMSecsSinceEpoch(msecs, Qt::TimeSpec::OffsetFromUTC, m_timezoneHoursOffset * 3600));
+  QDateTimeEdit::setDateTime(QDateTime::fromMSecsSinceEpoch(msecs, QTimeZone(m_timezoneHoursOffset * 3600)));
 }

 int LtsMSecDateTimeEdit::msecStepSize() const
@@ -50,11 +50,14 @@ QValidator::State LtsMultiRangeSpinBox::validate(QString &input, int &pos) const
 //  int value = input.toInt();
 //  value -= minimum();
 //  return (value % singleStep() == 0) ? QValidator::Acceptable : QValidator::Intermediate;
+  Q_UNUSED(input);
+  Q_UNUSED(pos);
  return QValidator::Acceptable;
 }

 void LtsMultiRangeSpinBox::fixup(QString &str) const
 {
+  Q_UNUSED(str);

 //  QSpinBox::fixup(str);

@@ -106,7 +106,7 @@ LtsSelectionPopup::~LtsSelectionPopup()

 void LtsSelectionPopup::slotFilterChanged()
 {
-  m_filter->setFilterWildcard(m_ui->leSearch->text().count() ? m_ui->leSearch->text() : QStringLiteral("*") /* show everything if nothing was entered */);
+  m_filter->setFilterWildcard(m_ui->leSearch->text().size() ? m_ui->leSearch->text() : QStringLiteral("*") /* show everything if nothing was entered */);
  refresh();
 }

@@ -139,7 +139,6 @@ void LtsTextEditor::slotTextBold()
  if (m_ui->textEdit->document()->isEmpty())
  {
    const QString &f = m_ui->cbFonts->currentText();
-    fmt.setFontFamily(f);
    fmt.setFontFamilies({f});
    fmt.setForeground(m_foregroundColor);
    const qreal pointSize = (m_ui->cbFontSize->currentText().toFloat() > 0 ? m_ui->cbFontSize->currentText().toFloat() : 11);
@@ -158,7 +157,6 @@ void LtsTextEditor::slotTextUnderline()
  if (m_ui->textEdit->document()->isEmpty())
  {
    const QString &f = m_ui->cbFonts->currentText();
-    fmt.setFontFamily(f);
    fmt.setFontFamilies({f});
    fmt.setForeground(m_foregroundColor);
    const qreal pointSize = (m_ui->cbFontSize->currentText().toFloat() > 0 ? m_ui->cbFontSize->currentText().toFloat() : 11);
@@ -177,7 +175,6 @@ void LtsTextEditor::slotTextItalic()
  if (m_ui->textEdit->document()->isEmpty())
  {
    const QString &f = m_ui->cbFonts->currentText();
-    fmt.setFontFamily(f);
    fmt.setFontFamilies({f});
    fmt.setForeground(m_foregroundColor);
    const qreal pointSize = (m_ui->cbFontSize->currentText().toFloat() > 0 ? m_ui->cbFontSize->currentText().toFloat() : 11);
@@ -202,7 +199,6 @@ void LtsTextEditor::slotTextFamily(int index)
    fmt.setForeground(m_foregroundColor);
  }
  const QString f = m_ui->cbFonts->currentText();
-  fmt.setFontFamily(f);
  fmt.setFontFamilies({f});
  slotMergeFormatOnWordOrSelection(fmt);
 }
@@ -223,7 +219,6 @@ void LtsTextEditor::slotTextSize(int index)
    if (m_ui->textEdit->document()->isEmpty())
    {
      const QString &f = m_ui->cbFonts->currentText();
-      fmt.setFontFamily(f);
      fmt.setFontFamilies({f});
      fmt.setForeground(m_foregroundColor);

@@ -273,7 +268,6 @@ void LtsTextEditor::slotTextColor()
    fmt.setFontWeight(m_ui->pbBold->isChecked() ? QFont::Bold : QFont::Normal);

    const QString &f = m_ui->cbFonts->currentText();
-    fmt.setFontFamily(f);
    fmt.setFontFamilies({f});
    const qreal pointSize = (m_ui->cbFontSize->currentText().toFloat() > 0 ? m_ui->cbFontSize->currentText().toFloat() : 11);
    fmt.setFontPointSize(pointSize);
@@ -652,7 +652,7 @@ void LtsTextEditor2::onTextItalic()
 void LtsTextEditor2::onTextFamily(const QString &f)
 {
  QTextCharFormat fmt;
-  fmt.setFontFamily(f);
+  fmt.setFontFamilies({f});
  mergeFormatOnWordOrSelection(fmt);
 }

@@ -1,142 +0,0 @@
-
-
-#include "requirement_widget.h"
-
-#include <LtsWidgets/lts_message_dialog.h>
-#include <QtWidgets/QApplication>
-#include <QtWidgets/QLabel>
-
-namespace LtsWidgets
-{
-UiRequirement::UiRequirement(QLabel* descriptionLabel, const std::function<bool()>& requirementCheck,
-                             const QString& userWarningMessage)
-    : m_descriptionLabel(descriptionLabel), m_requirementCheck(requirementCheck), m_lastResult(true),
-      m_userWarningMessage(userWarningMessage)
-{
-    retranslate();
-}
-
-void UiRequirement::reset()
-{
-    if (!isValid())
-        return;
-    m_descriptionLabel->setText(m_originalText);
-    m_descriptionLabel->setToolTip(m_originalTooltip);
-}
-
-void UiRequirement::setTexts()
-{
-    if (!isValid())
-        return;
-    if (!m_lastResult)
-    {
-        m_descriptionLabel->setText(
-            QStringLiteral("<span style=\"color:#aa0000;\">\u2022 %1</span>").arg(m_originalText));
-
-        if (!m_userWarningMessage.isEmpty())
-        {
-            m_descriptionLabel->setCursor(Qt::WhatsThisCursor);
-            m_descriptionLabel->setToolTip(m_userWarningMessage);
-        }
-    }
-    else
-    {
-        if (m_originalText.startsWith(QStringLiteral("\u2022 ")))
-            return;
-
-        m_descriptionLabel->setText(QStringLiteral("\u2022 %1").arg(m_originalText));
-        m_descriptionLabel->setCursor(Qt::ArrowCursor);
-        m_descriptionLabel->setToolTip(m_originalTooltip);
-    }
-}
-
-void UiRequirement::retranslate()
-{
-    if (!isValid())
-        return;
-
-    if (m_originalText.startsWith(QStringLiteral("\u2022 ")))
-        return;
-
-    auto x = m_descriptionLabel->text();
-    if (x.startsWith(QStringLiteral("\u2022 ")))
-        return;
-
-    m_originalText = x;
-
-    m_originalTooltip = m_descriptionLabel->toolTip();
-    setTexts();
-}
-
-bool UiRequirement::checkRequirement()
-{
-    if (!isValid())
-        return m_lastResult;
-
-    m_lastResult = m_requirementCheck();
-
-    if (!m_descriptionLabel->isVisible() && !m_descriptionLabel->property("checkMe").toBool())
-    {
-        return true;
-    }
-
-    setTexts();
-
-    return m_lastResult;
-}
-
-bool UiRequirementList::checkRequirements(QWidget* messageOnThisParent)
-{
-    bool result = true;
-    for (auto i = m_requirementList.begin(); i != m_requirementList.end(); ++i)
-    {
-        UiRequirement& r = (*i);
-
-        if (!r.isValid())
-            continue;
-
-        if (!r.checkRequirement())
-        {
-            result = false;
-        }
-    }
-
-    if (!result && messageOnThisParent)
-    {
-        LtsWidgets::LtsMessageDialog::showMessage(
-            messageOnThisParent,
-            QApplication::translate("LtsWidgets::LtsDialog",
-                                    "There are elements that have invalid or no value.<br>"
-                                    "Please change values in the elements which are marked with red text."),
-            QApplication::translate("LtsWidgets::LtsDialog", "Operation not complete"));
-    }
-
-    return result;
-}
-
-void UiRequirementList::addRequirement(const UiRequirement& uiRequirement)
-{
-    m_requirementList.append(uiRequirement);
-}
-
-void UiRequirementList::clear()
-{
-    for (auto i = m_requirementList.begin(); i != m_requirementList.end(); ++i)
-    {
-        UiRequirement& uir = *i;
-        uir.reset();
-    }
-
-    m_requirementList.clear();
-}
-
-void UiRequirementList::retranslate()
-{
-    for (auto i = m_requirementList.begin(); i != m_requirementList.end(); ++i)
-    {
-        UiRequirement& r = (*i);
-
-        r.retranslate();
-    }
-}
-} // namespace LtsWidgets
@@ -1,62 +0,0 @@
-
-
-#pragma once
-
-#include "lts_widgets_export.h"
-
-#include <QtCore/QVector>
-#include <QtWidgets/QWidget>
-#include <functional>
-
-class QLabel;
-
-namespace LtsWidgets
-{
-
-class LTSWIDGETS_EXPORT UiRequirement
-{
-  public:
-    explicit UiRequirement() = default;
-
-    UiRequirement(QLabel* descriptionLabel, const std::function<bool()>& requirementCheck,
-                  const QString& userWarningMessage = QString());
-
-    void reset();
-
-    bool checkRequirement();
-
-    bool isValid() const
-    {
-        return m_descriptionLabel != nullptr;
-    }
-
-    void retranslate();
-
-  private:
-    void setTexts();
-
-    QLabel* m_descriptionLabel;
-    std::function<bool()> m_requirementCheck;
-    QString m_originalText;
-    QString m_originalTooltip;
-    bool m_lastResult;
-    QString m_userWarningMessage;
-};
-
-class LTSWIDGETS_EXPORT UiRequirementList
-{
-  public:
-    UiRequirementList() = default;
-
-    bool checkRequirements(QWidget* messageOnThisParent = nullptr);
-
-    void addRequirement(const UiRequirement& uiRequirement);
-
-    void clear();
-
-    void retranslate();
-
-  private:
-    QVector<UiRequirement> m_requirementList;
-};
-} // namespace LtsWidgets
@@ -56,3 +56,22 @@ TARGET_INCLUDE_DIRECTORIES(TopicReplayInterface PUBLIC
  ${CMAKE_BINARY_DIR}/Lts/Common/TopicEditorBase # topiceditorbase_export.h
 )
 TARGET_LINK_LIBRARIES(TopicReplayInterface PUBLIC Qt6::Core TopicEditorBase)
+
+# These interface base classes (e.g. DataPluginBase::Plugin) are Q_OBJECT classes. The top-level
+# CMAKE_CXX_VISIBILITY_PRESET hidden compiles their Q_OBJECT meta symbols (staticMetaObject/vtable/
+# qt_metacall/typeinfo) as GLOBAL HIDDEN, so they are not exported from the .so. A cross-DSO
+# subclass (e.g. AsbDataPlugin) then fails with "undefined reference to ...::staticMetaObject".
+# Compile these interface libs with default visibility so the meta symbols are exported to consumers
+# (the legacy build, without LTO, exported them). This only widens the export surface of these tiny
+# interface libs; it changes no runtime behaviour.
+set_target_properties(
+  DataPluginInterface
+  GuiPluginInterface
+  ProjectPluginInterface
+  StylePluginInterface
+  RecordReplayPlugin
+  TopicReplayInterface
+  PROPERTIES
+    CXX_VISIBILITY_PRESET default
+    CXX_VISIBILITY_INLINES_HIDDEN OFF
+)
@@ -47,7 +47,7 @@ class Interface
 {
  public:
    Interface(LtsSession::LtsSession* session, NGL::INGLLogger& logger)
-        : m_hasInit(true), m_session(session), m_logger(logger), m_appId(LtsAppDescriptor::App::Login)
+        : m_hasInit(true), m_session(session), m_appId(LtsAppDescriptor::App::Login), m_logger(logger)
    {
    }

@@ -132,12 +132,12 @@ class Interface

  protected:
    LtsSession::LtsSession* m_session;
+    NGL::INGLLogger& m_logger;

  private:
    QFlags<LtsAppDescriptor::PluginInfo::Flag> m_flags;
    QStringList m_options;
    LtsAppDescriptor::App m_appId;
-    NGL::INGLLogger& m_logger;
 };

 } // namespace GuiPluginBase
@@ -45,6 +45,7 @@ NGL_ADD_LIBRARY2(WS TopicEditorBase SHARED ${topic_editor_base_SRCS})
 NGL_TARGET_INCLUDE_DIRECTORIES(TopicEditorBase
  PUBLIC
    ${CMAKE_CURRENT_SOURCE_DIR}/../
+    ${CMAKE_CURRENT_BINARY_DIR} # topiceditorbase_export.h (generated here)
    ${CMAKE_CURRENT_BINARY_DIR}/../ # auto-export file
    ${CMAKE_BINARY_DIR}/Z/src/NGLLogger # ngllogger_export.h
 )
@@ -2,7 +2,7 @@

 #pragma once
 #include "topic_editor_utils.h"
-#include "topiceditorbase_export.h"
+#include <Lts/Common/TopicEditorBase/topiceditorbase_export.h>

 #include <LtsUtils/LtsUtilsCore/promise.h>
 #include <LtsWidgets/lts_dialog.h>
@@ -1,6 +1,6 @@
 #pragma once

-#include "topiceditorbase_export.h"
+#include <Lts/Common/TopicEditorBase/topiceditorbase_export.h>

 #include <LtsScriptTimeline/track_entry.h>
 #include <QtCore/QVector>
@@ -1,6 +1,6 @@
 #pragma once
 #include "topic_editor_utils.h"
-#include "topiceditorbase_export.h"
+#include <Lts/Common/TopicEditorBase/topiceditorbase_export.h>

 #include <QtCore/QObject>
 #include <QtWidgets/QWidget>
@@ -1,6 +1,6 @@
 #pragma once
 #include "topic_editor_utils.h"
-#include "topiceditorbase_export.h"
+#include <Lts/Common/TopicEditorBase/topiceditorbase_export.h>

 #include <QtCore/QObject>
 #include <QtWidgets/QWidget>
@@ -6,10 +6,14 @@

 IF(BUILD_RTI)
  ADD_SUBDIRECTORY(QosProfile)
-  ADD_SUBDIRECTORY(DDSConnector)
 ENDIF()

 ADD_SUBDIRECTORY(DTC)
+
+IF(BUILD_RTI)
+  ADD_SUBDIRECTORY(DDSConnector)
+ENDIF()
+
 ADD_SUBDIRECTORY(DTS)
 IF(BUILD_RTI)
  ADD_SUBDIRECTORY(FTC)
@@ -20,11 +24,12 @@ ADD_SUBDIRECTORY(Routing)

 ADD_SUBDIRECTORY(Core)

-# During stepwise migration, add placeholder CTest entries before the
-# real DdsUnitTests subdir so the test-suite shows migration status even
-# when internal codegen targets are not yet available.
-ADD_SUBDIRECTORY(DdsUnitTestsPlaceholder)
-
+# During stepwise migration, add placeholder CTest entries after the
+# real DdsUnitTests subdir so the test-suite can use real targets when
+# internal codegen/RTI targets are available, and fall back to placeholders
+# only when they are not.
 IF(BUILD_RTI)
  ADD_SUBDIRECTORY(DdsUnitTests)
 ENDIF()
+
+ADD_SUBDIRECTORY(DdsUnitTestsPlaceholder)
@@ -19,7 +19,7 @@ LOGGER_T getLogger(const char *name)

  try
  {
-    return NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger( loggerName );
+    return ::NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger( loggerName );
  }
  catch ( const std::exception &ex )
  {
@@ -8,6 +8,6 @@

 namespace Core
 {
-  using LOGGER_T = NGL::INGLLogger&;
+  using LOGGER_T = ::NGL::INGLLogger&;
  CORE_COMMON_EXPORT LOGGER_T getLogger(const char *name);
 } 
@@ -59,7 +59,7 @@ void Pacemaker::addPort(unsigned short number, Core::CorePortType portType, cons

 void Pacemaker::addPortInternal(unsigned short number, Core::CorePortType portType, const QString& properties)
 {
-    if (!m_state.ports.is_set())
+    if (!m_state.ports.has_value())
        m_state.ports = std::vector<Core::PortInformation>();
    m_state.ports.get().push_back(Core::PortInformation(number, portType, properties.toStdString()));

@@ -1,6 +1,9 @@
 #include "topic_lock_master.h"

+#if BUILD_RTI
+
 #include <DDS/DDSConnector/dds_connector.h>
+#include <functional>

 namespace Core
 {
@@ -27,12 +30,12 @@ bool TopicLockMaster::init(const std::shared_ptr<DDSConnector::DdsConnector> &dd
    return false;
  m_coreDtc->enableAll();

-  m_coreDtc->lockedEntitys([this] (const LockedEntity &data) {
+  m_coreDtc->lockedEntitys([this] (const ::Core::LockedEntity &data) {
    m_lockedEntitys << key(data.entityId, data.exerciseId, QString::fromStdString(data.entityTypeName));
  });

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

 }
+
+#endif // BUILD_RTI 
@@ -1,6 +1,11 @@


 #pragma once
+
+// Include Qt headers FIRST to prevent namespace pollution when RTI DDS headers include Qt
+#include <QtCore/QString>
+#include <QtCore/QUrl>
+#include <QtCore/QFlag>
 #include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
 #include <dds/sub/LoanedSamples.hpp>

@@ -25,8 +30,11 @@ template <typename DRO_OBJECT, typename SC> class GenericDtcSC

    virtual bool setSubscriberCallback(const SubscriberCallback& subscriberCallback) = 0;
    virtual dds::sub::LoanedSamples<TopicType> readAlive() const = 0;
+    virtual bool readAlive(TopicType& data) = 0;
    virtual dds::sub::LoanedSamples<TopicType> takeAlive() const = 0;
+    virtual bool takeAlive(TopicType& data) = 0;
    virtual dds::sub::LoanedSamples<TopicType> takeDisposed() const = 0;
+    virtual bool takeDisposed(TopicType& data) = 0;
    virtual bool hasSamples() const = 0;
    virtual DataReaderObject* dataReader() const = 0;
    virtual bool waitForHistoricalData(int timeoutMSec) = 0;
@@ -36,6 +44,22 @@ template <typename DRO_OBJECT>
 class GenericDtc
    : public GenericDtcSC<DRO_OBJECT, std::function<void(const typename DRO_OBJECT::TopicType&, DataModification)>>
 {
+  public:
+    using BaseClass = GenericDtcSC<DRO_OBJECT, std::function<void(const typename DRO_OBJECT::TopicType&, DataModification)>>;
+    using TopicType = typename BaseClass::TopicType;
+    
+    // Explicitly expose base class methods for accessibility through smart pointers
+    using BaseClass::readAlive;
+    using BaseClass::takeAlive;
+    using BaseClass::takeDisposed;
+    using BaseClass::SubscriberCallback;
+    bool setSubscriberCallback(const typename BaseClass::SubscriberCallback& callback) override { return BaseClass::setSubscriberCallback(callback); }
+    bool readAlive(TopicType& data) { return BaseClass::readAlive(data); }
+    bool takeAlive(TopicType& data) { return BaseClass::takeAlive(data); }
+    bool takeDisposed(TopicType& data) { return BaseClass::takeDisposed(data); }
+    bool hasSamples() const { return BaseClass::hasSamples(); }
+    DRO_OBJECT* dataReader() const override { return BaseClass::dataReader(); }
+    bool waitForHistoricalData(int timeoutMSec) { return BaseClass::waitForHistoricalData(timeoutMSec); }
 };

 template <typename DRO_OBJECT>
@@ -43,6 +67,22 @@ class GenericDtcSampleInfo
    : public GenericDtcSC<DRO_OBJECT,
                          std::function<void(const typename DRO_OBJECT::TopicType&, const dds::sub::SampleInfo&)>>
 {
+  public:
+    using BaseClass = GenericDtcSC<DRO_OBJECT, std::function<void(const typename DRO_OBJECT::TopicType&, const dds::sub::SampleInfo&)>>;
+    using TopicType = typename BaseClass::TopicType;
+    
+    // Explicitly expose base class methods for accessibility through smart pointers
+    using BaseClass::readAlive;
+    using BaseClass::takeAlive;
+    using BaseClass::takeDisposed;
+    using BaseClass::SubscriberCallback;
+    bool setSubscriberCallback(const typename BaseClass::SubscriberCallback& callback) override { return BaseClass::setSubscriberCallback(callback); }
+    bool readAlive(TopicType& data) { return BaseClass::readAlive(data); }
+    bool takeAlive(TopicType& data) { return BaseClass::takeAlive(data); }
+    bool takeDisposed(TopicType& data) { return BaseClass::takeDisposed(data); }
+    bool hasSamples() const { return BaseClass::hasSamples(); }
+    DRO_OBJECT* dataReader() const override { return BaseClass::dataReader(); }
+    bool waitForHistoricalData(int timeoutMSec) { return BaseClass::waitForHistoricalData(timeoutMSec); }
 };

 template <typename DRO_OBJECT>
@@ -50,6 +90,22 @@ class Ddtc
    : public GenericDtcSC<
          DRO_OBJECT, std::function<void(const typename DRO_OBJECT::TopicType&, const std::string&, DataModification)>>
 {
+  public:
+    using BaseClass = GenericDtcSC<DRO_OBJECT, std::function<void(const typename DRO_OBJECT::TopicType&, const std::string&, DataModification)>>;
+    using TopicType = typename BaseClass::TopicType;
+    
+    // Explicitly expose base class methods for accessibility through smart pointers
+    using BaseClass::readAlive;
+    using BaseClass::takeAlive;
+    using BaseClass::takeDisposed;
+    using BaseClass::SubscriberCallback;
+    bool setSubscriberCallback(const typename BaseClass::SubscriberCallback& callback) override { return BaseClass::setSubscriberCallback(callback); }
+    bool readAlive(TopicType& data) { return BaseClass::readAlive(data); }
+    bool takeAlive(TopicType& data) { return BaseClass::takeAlive(data); }
+    bool takeDisposed(TopicType& data) { return BaseClass::takeDisposed(data); }
+    bool hasSamples() const { return BaseClass::hasSamples(); }
+    DRO_OBJECT* dataReader() const override { return BaseClass::dataReader(); }
+    bool waitForHistoricalData(int timeoutMSec) { return BaseClass::waitForHistoricalData(timeoutMSec); }
 };

 template <typename DRO_OBJECT>
@@ -57,5 +113,21 @@ class DdtcSampleInfo
    : public GenericDtcSC<DRO_OBJECT, std::function<void(const typename DRO_OBJECT::TopicType&, const std::string&,
                                                         const dds::sub::SampleInfo&)>>
 {
+  public:
+    using BaseClass = GenericDtcSC<DRO_OBJECT, std::function<void(const typename DRO_OBJECT::TopicType&, const std::string&, const dds::sub::SampleInfo&)>>;
+    using TopicType = typename BaseClass::TopicType;
+    
+    // Explicitly expose base class methods for accessibility through smart pointers
+    using BaseClass::readAlive;
+    using BaseClass::takeAlive;
+    using BaseClass::takeDisposed;
+    using BaseClass::SubscriberCallback;
+    bool setSubscriberCallback(const typename BaseClass::SubscriberCallback& callback) override { return BaseClass::setSubscriberCallback(callback); }
+    bool readAlive(TopicType& data) { return BaseClass::readAlive(data); }
+    bool takeAlive(TopicType& data) { return BaseClass::takeAlive(data); }
+    bool takeDisposed(TopicType& data) { return BaseClass::takeDisposed(data); }
+    bool hasSamples() const { return BaseClass::hasSamples(); }
+    DRO_OBJECT* dataReader() const override { return BaseClass::dataReader(); }
+    bool waitForHistoricalData(int timeoutMSec) { return BaseClass::waitForHistoricalData(timeoutMSec); }
 };
 } // namespace DTC
@@ -2,19 +2,22 @@

 #pragma once

+// Include Qt headers FIRST to prevent namespace pollution when RTI DDS headers include Qt
+#include <QtCore/QString>
+#include <QtCore/QUrl>
+#include <QtCore/QFlag>
+#include <QtCore/QTimer>
 #include "generic_dtc.h"
-
 #include <DDS/Generic/generic_data_reader.h>
 #include <DDS/Generic/generic_logger.h>
 #include <DDS/Generic/subscriber_listener.h>
-#include <QtCore/QTimer>
 #include <dds/core/cond/StatusCondition.hpp>
 #include <dds/core/cond/WaitSet.hpp>

 namespace DDSGeneric
 {
 class DynamicDataReader;
-}
+} // namespace DDSGeneric

 namespace DTC
 {
@@ -108,6 +111,17 @@ class GenericDtcImplSubscriberTemplate : public DDSGeneric::SubscriberListenerCa
        return ret;
    }

+    bool readAlive(TopicTypeRead& data) override final
+    {
+        auto samples = readAlive();
+        if (samples.length() > 0)
+        {
+            data = samples[0].data();
+            return true;
+        }
+        return false;
+    }
+
    dds::sub::LoanedSamples<TopicTypeRead> takeAlive() const override final
    {
        if (!m_dataReaderObject)
@@ -121,6 +135,17 @@ class GenericDtcImplSubscriberTemplate : public DDSGeneric::SubscriberListenerCa
        return ret;
    }

+    bool takeAlive(TopicTypeRead& data) override final
+    {
+        auto samples = takeAlive();
+        if (samples.length() > 0)
+        {
+            data = samples[0].data();
+            return true;
+        }
+        return false;
+    }
+
    dds::sub::LoanedSamples<TopicTypeRead> takeDisposed() const override final
    {
        if (!m_dataReaderObject)
@@ -129,6 +154,17 @@ class GenericDtcImplSubscriberTemplate : public DDSGeneric::SubscriberListenerCa
        return m_dataReaderObject->takeDisposed();
    }

+    bool takeDisposed(TopicTypeRead& data) override final
+    {
+        auto samples = takeDisposed();
+        if (samples.length() > 0)
+        {
+            data = samples[0].data();
+            return true;
+        }
+        return false;
+    }
+
    bool hasSamples() const override final
    {
        if (!m_dataReaderObject)
@@ -154,7 +190,7 @@ class GenericDtcImplSubscriberTemplate : public DDSGeneric::SubscriberListenerCa
            if (dr.subscription_matched_status().current_count() == 0)
            {
                dds::core::cond::WaitSet ws;
-                dds::core::cond::StatusCondition cond(dr);
+                auto cond = dds::core::cond::StatusCondition(dr);
                cond.enabled_statuses(dds::core::status::StatusMask::subscription_matched());
                ws.attach_condition(cond);
                const dds::core::Duration waitTimeout(bWaitForever ? dds::core::Duration::infinite()