Deletes the two stub-header trees (249 files) that shadowed the real
rtiddsgen-generated DDS headers, and removes every reference to them.
CMake (15 include-path entries):
root CMakeLists.txt include_directories(.../forward-declarations);
NGL_TARGET_INCLUDE_DIRECTORIES entries in 7 service CMakeLists
(ServiceManagement, SoundManagement, SituationMap, ScreenRecording,
SituationReplayManagement, SituationReplay, ServiceMonitor)
Source includes that resolved to the root-level stubs (only 2, repointed to the
module-prefixed generated headers the rest of the tree already uses):
Lts/Services/AreaEffectSimulation/object_charge_effect.h
<aes_dtc.h> -> <AreaEffectSimulation/aes_dtc.h>
Lts/Proxies/TrainingAreaBaseOC/websocket_handler.h
<taboc_dtc.h> -> <TrainingAreaBaseOC/taboc_dtc.h>
(generic_dtc_impl.h needs no change: its quote-include "generic_dtc.h"
resolves to the real Lts/DDS/DTC/generic_dtc.h in the same directory)
Tests:
tests/test_migration_stubs.cpp: remove the redundant root-level stub test
(AesDtcCompiles) - the module-prefixed AreaEffectSimulationDtcCompiles test
already exercises the same AreaEffectSimulation::Interface header.
tests/test_skl_dtc.cpp: delete (removed-module compile test, already filtered
out of the build) and remove its now-obsolete CMake list(FILTER) exclusion.
Validation: full rebuild (build4, make -j4 -k) with the removal - 0 new compile
errors vs the pre-existing base-state baseline (77 unique real-error signatures
identical to baseline; all 15 'No such file' headers pre-existing).
Continue the Qt5->Qt6 migration so the LTS Projects (Group 10) and LTS
Application (Group 11) compile, link, and ctest runs.
Qt5->Qt6 API migration (resolves removed/deprecated Qt6 APIs) across Lts
Tools and Apps, e.g. QAction->QActionGroup, QAbstractSocket::errorOccurred,
Qt::SkipEmptyParts, QRandomGenerator, QInputDevice::DeviceType,
QRegularExpression, QLatin1Literal->QStringLiteral, and the SampleModel
m_description->description rename.
CMake build fixes:
- CMakeLists.txt: add Lts/Common to CMAKE_AUTOMOC_INCLUDE_DIRECTORIES so moc
resolves Q_INTERFACES(ProjectPlugin::Plugin) for the migrated Projects.
- cmake/NGLMacros.cmake: NGL_COMPILE_RESOURCES - replace return() (which aborts
the calling CMakeLists.txt) with an if/else/endif.
- OpApp/THP: guard the ArcGISQt5Hack link with $<IF:$<TARGET_EXISTS:...>> (the
target is absent when the SituationMap viewer is stubbed); matches
CentralEffectSimulation.
- LtsSession: prefer the in-tree svcCoreClient target over a FIND_LIBRARY in
/usr/local/lib.
- CnrProxyTester/DotMatrixDisplay: set AUTOUIC_SEARCH_PATHS for the ui/ subdir.
- TopicDiscover: link NGLLogger.
Export-header visibility stubs (expand the empty *_EXPORT macro to
__attribute__((visibility("default"))); the build sets -fvisibility=hidden and
these stubs shadow the CMake-generated header):
- include/LtsProjectionWorkstation/ltsprojectionworkstation_export.h (fixes
undefined reference to LtsProjectionWorkstation::getInstance /
setProjectionOperatorPreset)
- include/LtsSession/ltssession_export.h, include/LtsUtilsGuiDds/ltsutilsguidds_export.h (same pattern)
New plugin modules (copied from legacy) so LtsAppDescriptorChecker finds the
gui:3 IIDs referenced by the Projects' apps.json:
- TakeHomePackageManager/OldTHP gui:3:tpm.man, gui:3:tpm.usb
- PresentationManagement/.../ScriptEditor gui:3:pre.script.edit
- Timeline/Gui/EventTimelineClassic gui:3:tln.view
new_docker_build.sh: correct group targets to the actual CMake target names,
guard LtsReportDisplay on BUILD_CODIFICATION, and skip modules unavailable in
the prebuilt image (AsmWorkstationCertifier/botan2, TrajectoryWidget,
VideoImport, thp_viewer/VLC).
berrux-dev
marked the pull request as ready for review 2026-10-05 08:57:07 +00:00
berrux-dev
merged commit 43300efaa7 into feature/qt6-migration-projects-app-tools-viewer-validation2026-10-05 08:57:48 +00:00
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.
Deletes the two stub-header trees (249 files) that shadowed the real rtiddsgen-generated DDS headers, and removes every reference to them. CMake (15 include-path entries): root CMakeLists.txt include_directories(.../forward-declarations); NGL_TARGET_INCLUDE_DIRECTORIES entries in 7 service CMakeLists (ServiceManagement, SoundManagement, SituationMap, ScreenRecording, SituationReplayManagement, SituationReplay, ServiceMonitor) Source includes that resolved to the root-level stubs (only 2, repointed to the module-prefixed generated headers the rest of the tree already uses): Lts/Services/AreaEffectSimulation/object_charge_effect.h <aes_dtc.h> -> <AreaEffectSimulation/aes_dtc.h> Lts/Proxies/TrainingAreaBaseOC/websocket_handler.h <taboc_dtc.h> -> <TrainingAreaBaseOC/taboc_dtc.h> (generic_dtc_impl.h needs no change: its quote-include "generic_dtc.h" resolves to the real Lts/DDS/DTC/generic_dtc.h in the same directory) Tests: tests/test_migration_stubs.cpp: remove the redundant root-level stub test (AesDtcCompiles) - the module-prefixed AreaEffectSimulationDtcCompiles test already exercises the same AreaEffectSimulation::Interface header. tests/test_skl_dtc.cpp: delete (removed-module compile test, already filtered out of the build) and remove its now-obsolete CMake list(FILTER) exclusion. Validation: full rebuild (build4, make -j4 -k) with the removal - 0 new compile errors vs the pre-existing base-state baseline (77 unique real-error signatures identical to baseline; all 15 'No such file' headers pre-existing).Continue the Qt5->Qt6 migration so the LTS Projects (Group 10) and LTS Application (Group 11) compile, link, and ctest runs. Qt5->Qt6 API migration (resolves removed/deprecated Qt6 APIs) across Lts Tools and Apps, e.g. QAction->QActionGroup, QAbstractSocket::errorOccurred, Qt::SkipEmptyParts, QRandomGenerator, QInputDevice::DeviceType, QRegularExpression, QLatin1Literal->QStringLiteral, and the SampleModel m_description->description rename. CMake build fixes: - CMakeLists.txt: add Lts/Common to CMAKE_AUTOMOC_INCLUDE_DIRECTORIES so moc resolves Q_INTERFACES(ProjectPlugin::Plugin) for the migrated Projects. - cmake/NGLMacros.cmake: NGL_COMPILE_RESOURCES - replace return() (which aborts the calling CMakeLists.txt) with an if/else/endif. - OpApp/THP: guard the ArcGISQt5Hack link with $<IF:$<TARGET_EXISTS:...>> (the target is absent when the SituationMap viewer is stubbed); matches CentralEffectSimulation. - LtsSession: prefer the in-tree svcCoreClient target over a FIND_LIBRARY in /usr/local/lib. - CnrProxyTester/DotMatrixDisplay: set AUTOUIC_SEARCH_PATHS for the ui/ subdir. - TopicDiscover: link NGLLogger. Export-header visibility stubs (expand the empty *_EXPORT macro to __attribute__((visibility("default"))); the build sets -fvisibility=hidden and these stubs shadow the CMake-generated header): - include/LtsProjectionWorkstation/ltsprojectionworkstation_export.h (fixes undefined reference to LtsProjectionWorkstation::getInstance / setProjectionOperatorPreset) - include/LtsSession/ltssession_export.h, include/LtsUtilsGuiDds/ltsutilsguidds_export.h (same pattern) New plugin modules (copied from legacy) so LtsAppDescriptorChecker finds the gui:3 IIDs referenced by the Projects' apps.json: - TakeHomePackageManager/OldTHP gui:3:tpm.man, gui:3:tpm.usb - PresentationManagement/.../ScriptEditor gui:3:pre.script.edit - Timeline/Gui/EventTimelineClassic gui:3:tln.view new_docker_build.sh: correct group targets to the actual CMake target names, guard LtsReportDisplay on BUILD_CODIFICATION, and skip modules unavailable in the prebuilt image (AsmWorkstationCertifier/botan2, TrajectoryWidget, VideoImport, thp_viewer/VLC).